1
0
Fork 0
Commit Graph

978 Commits

Author SHA1 Message Date
Heiko Kernbach dad88314bc bugfix queries 2013-07-17 22:17:15 +02:00
Heiko Kernbach b75beccefb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-17 20:48:23 +02:00
Heiko Kernbach 3aa8a084c0 new extras for aql shell 2013-07-17 20:48:16 +02:00
Michael Hackstein 5d5c9183d7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-17 15:41:05 +02:00
Michael Hackstein ea672e29fd GraphViewer: When collapsing community nodes the WebWorker for modularityJoiner is now informed properly, no duplicate edge removals or removals of communitynodes 2013-07-17 15:40:58 +02:00
Heiko Kernbach ca3a2f3358 fixed autoresizing query view 2013-07-17 15:23:46 +02:00
Heiko Kernbach 515a4c8934 added spelling errors 2013-07-17 15:19:12 +02:00
Heiko Kernbach 303de4e555 fixed jslint errors 2013-07-17 15:11:14 +02:00
Heiko Kernbach 9b59dc802a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-17 15:05:03 +02:00
Heiko Kernbach eb8ca374c6 added new options for editing aql statements 2013-07-17 15:04:53 +02:00
Michael Hackstein 480af37d9b GraphViewer: Fixed the bug with collapsing nodes within communities 2013-07-17 14:17:54 +02:00
Michael Hackstein 9b49b1dbdf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-17 12:54:33 +02:00
Michael Hackstein 61d11de8c4 GraphViewer: Fixed the test for the Nodeshaper to use CommunityNodes instead of selfmade alternatives 2013-07-17 12:54:25 +02:00
Michael Hackstein 335bfbc70b GraphViewer: The community nodes are now collapsed more or less correctly. Still missing: a->b->c if b is in community c should be collapsed as well 2013-07-17 12:44:50 +02:00
Jan Steemann 9c44964da5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-17 10:58:23 +02:00
Jan Steemann 08b9f57166 stoppable replication applier 2013-07-17 10:58:10 +02:00
Michael Hackstein d29ec0d9a9 GraphViewer: The CommunityNode now offers function to remove nodes and edges, as well as a function to remove all outbound at once 2013-07-17 10:34:18 +02:00
Michael Hackstein f8ca0ef0f9 Added quick community check to NodeShaper also 2013-07-17 08:18:48 +02:00
Michael Hackstein 9e0873b922 GraphViewer: Added a simple check if a node is a communityNode. No parsing of the id necessary anymore 2013-07-17 08:16:04 +02:00
Michael Hackstein e40a0b3abc GraphViewer: Added a test to reproduce a bug when collapsing a node with communities attached to it. 2013-07-17 08:04:46 +02:00
Heiko Kernbach 1b12e93a42 some format optimization for coll info view 2013-07-16 19:46:26 +02:00
Heiko Kernbach 9db5df839a extra info for collections + css 2013-07-16 19:16:03 +02:00
Michael Hackstein 9c749ab72f GraphViewer: Fixed the last bug of the CommunityNode, old functionality is now assured. Next: Let it render itself and its interior nodes 2013-07-16 18:37:41 +02:00
Michael Hackstein 452edf8acb GraphViewer: Fixed test for searchSubmit icon, which is now loading its image from css rather than from hardcoded source 2013-07-16 16:48:40 +02:00
Michael Hackstein 14a0acd2b5 GraphViewer: Further propageted the new CommunityNode object. Covering the old functionality is almost done, just 2 tests failing 2013-07-16 16:46:18 +02:00
Heiko Kernbach 36a082adfd test 2013-07-16 15:39:17 +02:00
Heiko Kernbach b23c5894d3 test 2013-07-16 15:37:26 +02:00
Jan Steemann cc42533b7d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	html/admin/js/views/collectionInfoView.js
2013-07-16 15:18:52 +02:00
Jan Steemann faa4dc1486 some web interface fixes 2013-07-16 15:17:39 +02:00
Michael Hackstein b9bd58fc29 GraphViewer: The community node now distinguished inbound, outbound and internal edges 2013-07-16 13:45:32 +02:00
Heiko Kernbach adc948ffe4 css + jslint 2013-07-16 13:11:02 +02:00
Heiko Kernbach 65ecde3d9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-16 13:10:18 +02:00
Heiko Kernbach f66be45ac4 #572 2013-07-16 13:10:10 +02:00
Michael Hackstein 94cb5253ff GraphViewer: CommunityNode now can collect internal edges and dissolve itself 2013-07-16 11:39:40 +02:00
Michael Hackstein 8ddec6ced7 GraphViewer: The communityNode should now be shapeable 2013-07-16 11:24:38 +02:00
Michael Hackstein 20e41e48ca GraphViewer: Added first basic functions for the community node 2013-07-16 10:59:39 +02:00
Michael Hackstein a190fa58e6 GraphViewer: Created Stubs for the new community node 2013-07-16 10:26:05 +02:00
Michael Hackstein 3b3fe9b8e9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-16 09:49:49 +02:00
Michael Hackstein fac84f1953 GraphViewer: Moved all static image loads to css. 2013-07-16 08:17:11 +02:00
Michael Hackstein a9479002f7 GraphViewer: The PriorityList now uses an icon for its buttons. Looks way more awesome 2013-07-16 08:09:52 +02:00
Michael Hackstein 20f81a39f2 GraphViewer: THe Interface now considers existing priorities in the list 2013-07-16 07:51:58 +02:00
Heiko Kernbach 71cf506728 ajax load indicator + css 2013-07-15 20:01:56 +02:00
Heiko Kernbach 0999b59dbf disabled login, css for import 2013-07-15 19:16:48 +02:00
Michael Hackstein ffb50b6705 GraphViewer: The nodeReducer now offers the prioList for reading. It is piped through the adapters allready 2013-07-15 18:37:13 +02:00
Michael Hackstein b7415789dc GraphViewer: Now the priority list is accessable like a real list. 2013-07-15 18:26:03 +02:00
Heiko Kernbach 644002c50e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-15 17:45:50 +02:00
Heiko Kernbach f5f23e6ab2 userlogin + import interface 2013-07-15 17:45:44 +02:00
Michael Hackstein b218888597 GraphViewer: It is now possible to add a prioritylist with one element. Multiple elements are ongoing work 2013-07-15 16:19:24 +02:00
Michael Hackstein 82ecce0b9a GraphViewer: The Adapters now propagate the changeTo configuration for the prioList to the nodeReducer 2013-07-15 15:13:02 +02:00
Michael Hackstein 3abf0bfd9e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-15 15:11:02 +02:00