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
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
Michael Hackstein d6fadca87d First version of plan for test setup and added stubs for other plans 2014-02-12 16:08:26 +01:00
scottashton a09b77ab55 finalized plaScenarioSelector, click events and karma tests 2014-02-12 15:55:22 +01:00
Michael Hackstein 79be948d3a Added test for test cluster plan 2014-02-12 15:04:22 +01:00
gschwab 0d2f3b945f karma configuration fixed 2014-02-12 14:44:53 +01:00
gschwab ae3fa2ec77 more tests fixed 2014-02-12 14:36:27 +01:00
Michael Hackstein a89aabfa26 Capitalized router name in Test and moved view spec to views 2014-02-12 14:15:14 +01:00
gschwab a21d499e51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 14:12:40 +01:00
gschwab 6d55f35058 fixed test 2014-02-12 14:12:18 +01:00
scottashton ca08841929 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-12 13:25:07 +01:00
scottashton c682dae057 planner 2014-02-12 13:21:20 +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 c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Michael Hackstein c83f4621c1 Fixed tests for new graphviwer toolbox layout 2014-02-04 09:21:03 +01:00
Michael Hackstein 1e21d3750f Fixed tests for graph previewer 2014-02-01 09:47:19 +01:00
Michael Hackstein f580bd1ade Fixed tests for translated arrow positions. 2014-01-31 23:38:33 +01:00
Michael Hackstein 7085c6cb6d The context menu in the graphviewer now has style of OSX 2014-01-31 21:38:47 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Michael Hackstein 0c62714017 Fixed a bug where dragging of nodes was not possible and connecting them with edges made everything even worse 2014-01-31 17:38:15 +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 d4346dc53d Fixed test for dropdown menu icons in header bar 2014-01-27 09:55:10 +01:00
Michael Hackstein 6b2472b05c Fixed tests for new graphviewer headerbar leayout 2014-01-27 09:33:46 +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 41b35c82da Prepared databases, collections and shards for retrieval from foxx. No Fake data involved in these classes anymore. ToDo: Foxx routes 2014-01-20 17:57:08 +01:00
Michael Hackstein 77003e90c0 Wired the Frontend for Cluster DBServers with the Backend. A missmatch is left due to changes in AgencyComm. Servers are always in state warning. 2014-01-19 22:47:54 +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 099fac2582 Fixed test for clusterCoordinator 2014-01-17 11:24:29 +01:00
Michael Hackstein 052e84fc2e First version of Coordinator Overview in cluster 2014-01-17 10:36:03 +01:00
Michael Hackstein 1a233fb1d5 Added first version of Cluster collection overview 2014-01-17 09:24:46 +01:00
Michael Hackstein 7b37f6840d Added first version of cluster database overview. Right now only datbase name is presented to the user 2014-01-16 15:58:39 +01:00
Michael Hackstein f95c3dfa79 First version of primary server view in the cluster 2014-01-16 15:23:28 +01:00
Michael Hackstein 3421822f0e First version of server view displaying pairs of db servers. Design missing 2014-01-15 17:13:59 +01:00
Michael Hackstein a4e500ebf5 Improved the overview and added a seperate coordinators view, it is actually completely different compared to db servers 2014-01-15 17:08:56 +01:00
Michael Hackstein bb1a12c76b Finished first version of Cluster Overview using fake data. User now gets a prominent overview over his cluster and can decide if coordinators or databases are effected by failures 2014-01-15 14:49:56 +01:00
Michael Hackstein 5622b1a1f4 Added Headlines to all cluster columns 2014-01-14 17:18:02 +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 6b8333207b Added first implementation of the Cluster Dashboard. Functionality is basic, displayed data is faked and design is comming soon 2014-01-14 14:52: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 ec83539390 The start view of the graph viewer now offers support for multiple label/colour attributes 2013-12-18 09:36:05 +01:00
Michael Hackstein bf520f652f GraphViewer it is now possible to define a list of label attributes and colour attributes 2013-12-17 23:25:06 +01:00
Michael Hackstein d3be3c37b8 GraphViewer: Nodes can now be coloured by a list of attributes also. Still Missing Interface 2013-12-17 11:04:05 +01:00
Michael Hackstein 521314c73a The nodeshaper will now cut down long word labels. Also it is able internally use an array of label attributes. TODO: Add list to colours and offer interface for it 2013-12-17 09:57:40 +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 05a2baff05 The right-click context menu is now disabled in context of the SVG 2013-12-13 13:06:22 +01:00
Michael Hackstein 8624ab3278 GraphViewer: Whenever the content of the adapter is reseted now the content of the colourmap is reseted as well 2013-12-13 11:43:33 +01:00
Michael Hackstein 07cc648b55 Fixed a test in the dispatcher that failed unpredictibly 2013-12-13 11:17:03 +01:00
Michael Hackstein 18d2c3327b GraphVieweri: the abstract Adapter now propagetes a cleanUp call to the general viewer. 2013-12-13 11:16:19 +01:00
Michael Hackstein e6df75784f GraphViewer Added tests for the graphViewer object ot be passed arround through adapter instances, which is required for reset 2013-12-13 10:43:23 +01:00
Michael Hackstein 34b775086c Added test to reset the colourlist on attribute change 2013-12-12 09:43:37 +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 0c4b20d4cb Internal modification of the graph viewer ui 2013-12-04 18:26:45 +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 1697e3c326 Fixed bug for ArangoDB internal errors, they have not properly been presented to the user in the Graph Management 2013-12-02 15:36:33 +01:00
Michael Hackstein 242b02fe0f Added error messages to new graph management overview 2013-12-02 15:19:52 +01:00
Michael Hackstein 97678a7c36 Added new karma configuration now containing all files. 2013-12-02 13:27:18 +01:00
Michael Hackstein 4fc67b7381 Fixed GraphViewer CSS check, changed to different class but forgot the test 2013-12-02 13:20:31 +01:00
Michael Hackstein 103f36f223 Functionality of the graph management implemented. CSS to go 2013-11-29 14:51:48 +01:00
Michael Hackstein e04ff0822f Started implementing the graph management in the Web Interface. Tests are implemented as well as method stubs. Not yet functional and CSS is missing. 2013-11-29 09:53:37 +01:00
Michael Hackstein bb89e43515 Added a button to create the Graph Management Dialog 2013-11-28 15:29:12 +01:00
Michael Hackstein aa06036a1b Fixed karma config to load graph model and collection 2013-11-28 14:59:00 +01:00
Michael Hackstein ebb0ae026b Fixed ids that were given to multiple html elements. Added some tests for the graphView. Only Basics are tested, advanced options not yet 2013-11-28 13:25:27 +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
Michael Hackstein 7db1a72b0c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-27 13:09:36 +01:00
Michael Hackstein 3a81265afd Improved GraphViewer Layout 2013-11-27 13:07:38 +01:00
Michael Hackstein 045321b318 Moved the selection box from navigation bar back to footer bar 2013-11-17 00:02:08 +01:00
Michael Hackstein 29cb5f2d8b Started implementation of the new document editing mask 2013-11-16 17:38:56 +01:00
Michael Hackstein e40dcf61b0 Modified NavigationView, it is now easier to render and tests 2013-11-16 01:42:54 +01:00
Michael Hackstein 44d8e7e94e DB Selection view is now managed by the router and not managed by navigationView any more 2013-11-16 00:43:37 +01:00
Michael Hackstein 73839cc593 Moved db selection to router 2013-11-15 23:50:11 +01:00
Michael Hackstein e7b88943f0 Fixed JSLint and added JSLint to karma tests again. 2013-11-15 21:31:15 +01:00
Michael Hackstein 15c2618033 Added tests for the router and fixed tests for capitalized view names 2013-11-15 00:05:30 +01:00
Michael Hackstein 0996649a6e Added implementation for a current database model 2013-11-14 13:28:12 +01:00
Michael Hackstein 2e9f38f352 Added test and method stub for curent database model. Karma tests will fail by intention (jenkins test) 2013-11-14 12:04:57 +01:00
Michael Hackstein 9f05b2800f Added a test suite for the navigation bar. Right now tests all visible tabs and their navigation funcitonality 2013-11-14 09:57:55 +01:00
Michael Hackstein 1aabc1ee3a Test for Jenkins 2013-11-13 18:01:57 +01:00
Michael Hackstein f411498cd1 Updated karma config for jenkins 2013-11-13 17:25:31 +01:00
Michael Hackstein f387ba776f Modified karma conf to support Jenkins 2013-11-13 16:16:06 +01:00
Michael Hackstein 13c74c1e1c Fixed JSLint warnings, added JSLint to karma, will now be automatically checked. Wrapped all files in an anonymouse function and added usefull use strict 2013-11-12 16:09:40 +01:00
Michael Hackstein 61ab284433 Removed swp files, sorry... 2013-11-12 14:02:53 +01:00
Michael Hackstein 41ea74dca5 Fixed JSLint to work with karma now. Some JSLint errors still occur 2013-11-12 14:01:09 +01:00
Michael Hackstein 60026f40f2 Removed debug console.log in tests 2013-11-04 16:31:20 +01:00
Michael Hackstein bb8c34620f Finally managed to setup a karma server able to test EJS templates and everything yeah. However EJS has to be wrapped for this testing 2013-11-04 16:16:11 +01:00
Jan Steemann 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00