1
0
Fork 0
Commit Graph

70 Commits

Author SHA1 Message Date
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 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 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
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 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 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