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

245 Commits

Author SHA1 Message Date
scottashton f4cd6dcea7 removed unsused cluster views 2014-04-04 16:25:47 +02:00
scottashton b5f1253ac4 finished documentViewTest 2014-04-04 14:47:04 +02:00
Heiko Kernbach 34f061f85c excluded libs from coverage tests 2014-04-04 11:44:27 +02:00
scottashton f891d7d253 documentsViewSpec 2014-04-03 16:34:25 +02:00
Michael Hackstein 906f40e57e Fixed user profile route test 2014-04-03 15:40:05 +02:00
Michael Hackstein f9a5548e03 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-03 10:22:15 +02:00
Michael Hackstein 377f9fec1d Added test for the delete button and actually showed and hided the dialog 2014-04-03 10:22:12 +02:00
scottashton 52b48fe586 fixed routerspec and removed unneccesary logs 2014-04-03 09:54:24 +02:00
Michael Hackstein e647e5e8e1 Added test for delete button 2014-04-03 09:43:09 +02:00
Michael Hackstein 21f8ae668c Fixed jslint warnings 2014-04-02 17:58:19 +02:00
Michael Hackstein 44c301bfae Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-02 17:33:38 +02:00
Michael Hackstein fe246890ae Added tests for modal table template 2014-04-02 17:33:34 +02:00
scottashton a0e5a2e1fb CollectionsViewSpec 2014-04-02 17:02:43 +02:00
Michael Hackstein 58f79be9a2 Start of modal view implementation 2014-04-02 14:43:32 +02:00
scottashton 35e0e1c046 jslinted overwriteAjax.js 2014-04-01 13:48:04 +02:00
scottashton a4acff49d9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-01 13:41:37 +02:00
scottashton 8f44385c43 finished router tests 2014-04-01 13:41:29 +02:00
gschwab a2c292d8ac tests added for model arangoReplicationSpec.js 2014-04-01 13:22:21 +02:00
gschwab 01f4d8840d tests added for model arangoUsers.js 2014-04-01 13:08:15 +02:00
gschwab d4cd7ab629 added missing models 2014-04-01 13:02:32 +02:00
Michael Hackstein dc3289cc31 Karma frontend integration tests: Relinked all ajax-requests to a different arangod running on port 7777 2014-04-01 12:59:28 +02:00
scottashton f7ceebe35b reformated tests 2014-03-31 14:31:39 +02:00
scottashton 6c09b13d56 fixed tests 2014-03-31 14:21:38 +02:00
scottashton b111ffd8c2 Revert " finished router tests and reformated test files" 
This reverts commit 2352b41ba8a067eb7fb02258d322bba8ddc37809.
 2014-03-31 13:33:39 +02:00
scottashton 86dd3cc94b finished router tests and reformated test files 2014-03-31 13:05:36 +02:00
scottashton e8904d5d93 fixed jslint 2014-03-27 12:15:13 +01:00
scottashton fd2253076e testing collections and models finished, coverage = 100% 2014-03-27 11:06:42 +01:00
gschwab 23f6ece5d4 fixed wrong filename O.o 2014-03-27 09:12:42 +01:00
scottashton 48003a69e9 cluster tests 2014-03-26 17:43:20 +01:00
scottashton 2c1981ea1b finished frontend/collections tests 2014-03-26 14:44:06 +01:00
scottashton ca5ccf9a39 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 17:52:22 +01:00
scottashton 78d7a2c18a more tests 2014-03-25 17:52:14 +01:00
gschwab d7dbb38587 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 17:16:44 +01:00
gschwab 3ef97931f2 karma test for some more models 2014-03-25 17:16:34 +01:00
scottashton 213c61d104 merged conflict 2014-03-25 16:08:17 +01:00
scottashton 1b5e31b9d7 starting collections tests 2014-03-25 16:06:37 +01:00
gschwab 444a84157b karma test for some models, small refactoring (renaming) of ../collections/arangoStatisticsDescriptionCollection.js 2014-03-25 10:20:09 +01:00
Heiko Kernbach 24df691dd0 files now in files.json 2014-03-24 17:54:44 +01:00
scottashton 9e8cc5613c added testSpec for arangoCollections 2014-03-24 17:39:08 +01:00
gschwab 416e2bcd04 conf for local coverage report 2014-03-24 16:15:39 +01:00
Heiko Kernbach afdb776b51 html->cobertura 2014-03-24 15:37:45 +01:00
Heiko Kernbach 7b53a4fe4f karma for coverage 2014-03-24 15:13:55 +01:00
Michael Hackstein 1c825f12b3 I am to stupid to use a keyboard... 2014-03-21 11:22:36 +01:00
Michael Hackstein ef0562149a Fixed karma ui tests 2014-03-21 11:18:33 +01:00
Michael Hackstein d5003db6b8 Fixed js-lint 2014-03-19 16:52:14 +01:00
Michael Hackstein c3516c60c4 Fixed karma tests and jslint whining 2014-03-17 16:58:53 +01:00
Michael Hackstein fe1762beda Fixed a bug in the configuration for the graph viewer 2014-03-17 08:32:00 +01:00
Jan Steemann 97d428341b issue #781: Cant save current query from AQL editor ui 2014-03-14 17:56:18 +01:00
Heiko Kernbach 89245e0ce3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 15:18:43 +01:00
Heiko Kernbach 89f1ea5b8a removed licence+readme 2014-03-11 15:18:35 +01:00
Heiko Kernbach 1cb89427c5 added phantomcss 2014-03-11 15:18:16 +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 4bd3437216 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-11 13:43:07 +01:00
Michael Hackstein 419db23614 Fixed further JSTests 2014-03-11 13:42:28 +01:00
gschwab 87f6f1fb12 fixed tests in dbSelectionViewSpec.js 2014-03-11 13:32:21 +01:00
gschwab 91f3e3ed35 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 13:18:18 +01:00
gschwab 8bfd88fd7e fixed tests 2014-03-11 13:18:08 +01:00
Heiko Kernbach 57b338fd54 fixed clusterCollection/Shards jasmine specs 2014-03-11 13:07:33 +01:00
Heiko Kernbach 1f40a190e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-11 11:44:32 +01:00
Heiko Kernbach 186183da87 clusterDatabase/Servers - Specs fixed 2014-03-11 11:44:17 +01:00
gschwab 2db8c09b12 fixed one test 2014-03-11 11:39:12 +01:00
gschwab 0f7777c3bf fixed navigationViewSpec.js tests 2014-03-11 11:15:56 +01:00
Michael Hackstein 0469b08d7b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-11 10:35:30 +01:00
Michael Hackstein 1b3b286a7e Fixed further tests in the graph viewer 2014-03-11 10:35:22 +01:00
Michael Hackstein 8739215b76 Fixed GraphViewer check for btn-primary to require button-primary instead, the new class 2014-03-11 10:22:10 +01:00
gschwab 637e1bbc66 fixed some tests 2014-03-11 10:11:06 +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
gschwab 43b0e8c692 css refactoring: deleted .thumbnails2 and appearences 2014-03-06 14:19:56 +01:00
gschwab d7d41d7ca5 merged project planner into cluster 2014-02-27 10:51:27 +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
Heiko Kernbach 808e2deae5 spelling errors 2014-02-20 16:32:52 +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 dafbe9f025 gritter cleanup 2014-02-19 16:00:55 +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
Frank Celler 066abd777c Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-02-19 10:21:00 +01:00
gschwab dfb352a23c added some userManagement functionality 2014-02-19 08:38:04 +01:00
Heiko Kernbach a2e1425b87 karma fix for navigationviewspec 2014-02-18 16:00:00 +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 c9193d153f removed obsolesce test 2014-02-17 11:55:22 +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
Michael Hackstein 00007a653f Fixed tests for cluster planner 2014-02-14 13:40:47 +01:00
Frank Celler 92172bc59a Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 2014-02-13 16:38:46 +01:00
scottashton 7e1562fcfd fixed bug in planSymmetricView.js 2014-02-13 16:26:09 +01:00
scottashton 9399387dac refactored planSymmetricView 2014-02-13 15:10:09 +01:00
gschwab 485958a2a2 tests fixed 2014-02-13 13:10:54 +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
Michael Hackstein 4e6f826991 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 16:08:31 +01:00