Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,440 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

58 Commits

Author SHA1 Message Date
Michael Hackstein 6ae3f3958c Made karma.conf again jenkins compatible 2014-11-06 13:41:48 +00:00
Michael Hackstein 3fe3e6dbd6 Fixed merge conflict. Still waiting for a fix from Frank for falsly matching of %2F as / in routes 2014-11-05 09:41:26 +00:00
Heiko Kernbach 24df691dd0 files now in files.json 2014-03-24 17:54:44 +01:00
gschwab 306f9674de fixed some more tests, should be all green now 2014-03-11 14:57:02 +01:00
Michael Hackstein 7247ed9acb Removed unused views from tests 2014-03-11 13:46:22 +01:00
Michael Hackstein 55b1713dbf Fixed JSLint warnings 2014-03-09 08:32:34 +01:00
Michael Hackstein 34bafb61ec Removed unused files from karma configuration 2014-03-08 22:28:54 +01:00
Michael Hackstein cb2ab14f95 Revived karma server for testing. However many, many tests are broken now... 2014-03-07 00:01:23 +01:00
Max Neunhoeffer f7e57a5b47 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/manifest.json
	lib/Rest/EndpointIp.cpp
	lib/Rest/EndpointUnixDomain.cpp
	lib/V8/v8-utils.cpp
 2014-02-21 15:28:21 +01:00
Heiko Kernbach 3e559d9afd cleanup old source view 2014-02-20 23:23:13 +01:00
Michael Hackstein d0d61fb5a3 Integerated the new underscore templates in the admin interface. Performancebost of 50% yay 2014-02-20 20:31:53 +01:00
Michael Hackstein f58fb5c310 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/userProfileView.ejs
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-20 17:11:18 +01:00
Michael Hackstein 98576c9963 Massive change, removed ejs and replaced it with underscore templates. Changed template engine and some rendering functions. All templates are now included in one large index.html and are not requested sequentially 2014-02-20 16:56:24 +01:00
Jan Steemann ad0636fc58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
 2014-02-20 16:05:00 +01:00
Heiko Kernbach e00c398ab8 jquery update + cleanup, swagger-fix 2014-02-20 13:12:15 +01:00
Michael Hackstein efa911632f Merge remote-tracking branch 'origin/devel' into sharding 2014-02-19 16:12:00 +01:00
Heiko Kernbach d04a34e720 cleanup 2014-02-19 15:51:13 +01:00
Heiko Kernbach 7d64371ff0 ejs: karma + manifest 2014-02-19 15:37:52 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Heiko Kernbach bcf587847a karma 2014-02-14 20:43:01 +01:00
scottashton 907f9127e9 starting clusterFrontend 2014-02-14 13:59:29 +01:00
scottashton ebc4e96da4 finished asymmetrical and symmetrical plan 2014-02-13 12:01:52 +01:00
scottashton f196f4361d finished asymmetrical and symmetrical plan 2014-02-13 12:00:50 +01:00
Frank Celler 95472a82eb Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-13 11:07:01 +01:00
gschwab 0d2f3b945f karma configuration fixed 2014-02-12 14:44:53 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
 2014-02-12 12:53:08 +01:00
scottashton dae77412a8 plannerFrontend Router setup and karma tests 2014-02-12 12:00:04 +01:00
Heiko Kernbach f215495c0f karma&jslint 2014-02-12 10:40:23 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-01-30 19:40:21 +01:00
Michael Hackstein a51979818a Added test for graph deletion confirmation 2014-01-30 17:13:23 +01:00
Michael Hackstein d78e3ed92b Added tests for cluster views, of necessary information is passed through each view 2014-01-21 16:48:33 +01:00
Michael Hackstein a0cb9d832f Created Models and Collections for cluster objects. These return fake data right now, but make wiring to foxx a lot easier 2014-01-18 20:15:20 +01:00
Michael Hackstein e5c9fbec3e Added a cascading unrender if clicking in Menu levels 2014-01-17 13:07:19 +01:00
Michael Hackstein 8816bfab14 Fixed merge confilct 2014-01-14 15:01:17 +01:00
Michael Hackstein 8948b87f12 Added the Cluster Dashboard to the karma tests 2014-01-14 14:55:52 +01:00
Michael Hackstein 4bb630b030 Further additions to router tests 2014-01-12 22:05:41 +01:00
Michael Hackstein 93065b4a3d Added some more tests to web-interface router. Some routes are tested now. Fixed some minor bugs during tests 2014-01-12 14:44:21 +01:00
Michael Hackstein 3be384a624 Fixed all karma tests (especially JSLint in Browsers). Problem is that i had a test checking for location.replace which did fail but pointed the browser to some undefined location instead 2013-12-17 09:06:46 +01:00
Michael Hackstein 5bf4714ce0 Fixed merge conflict in karma.conf 2013-12-16 16:42:44 +01:00
Michael Hackstein 490417de31 Started with adding a context menu for nodes. Modified karma config. It now does not run JSLint and WebWorkers specific tests, they somhow fail on the jenkins server. Will be fixed again 2013-12-16 16:41:24 +01:00
Frank Celler 99c79485e8 added firefox 2013-12-16 11:14:27 +01:00
Michael Hackstein f04c25e051 Finally all GraphViewer Tests added and running under phantomjs and added to automatic test 2013-12-10 10:51:41 +01:00
Michael Hackstein 62e9a9d3d6 Fixed tests for arango ui component in graphviewer. It is now also added to PhantomJS test suite 2013-12-08 14:42:00 +01:00
Michael Hackstein cb854e8250 Fixed tests for modularityJoiner to run with phantomJS (different result because of different sorting order of object keys) 2013-12-08 13:23:34 +01:00
Michael Hackstein 87e056ea25 Fixed karma config, it now requires d3.v3.min instead of d3.v3. There is inconsistent behaviour between these two 2013-12-04 18:19:02 +01:00
Michael Hackstein 97678a7c36 Added new karma configuration now containing all files. 2013-12-02 13:27:18 +01:00
Michael Hackstein aa06036a1b Fixed karma config to load graph model and collection 2013-11-28 14:59:00 +01:00
Michael Hackstein 4ec105f5e9 Made domObserver tests work with PhantomJS. Added to automatic tests 2013-11-28 09:48:03 +01:00
Michael Hackstein fed5b288e5 Fixed a bug in karma config, required a file with small caps name which actuall had capital letters 2013-11-28 09:10:07 +01:00
Michael Hackstein a79d9b5123 Moved karma tests for the GraphViewer to the central test repo. Made most of them work in Phantomjs, the others will follow. Now they are disabled for Jenkins 2013-11-28 00:48:19 +01:00