1
0
Fork 0
Commit Graph

1272 Commits

Author SHA1 Message Date
Heiko Kernbach a6936ac037 removed _id, _key, _rev from docs view 2013-07-24 13:59:18 +02:00
Heiko Kernbach 5cee9f5c10 new import position, upload indicator change 2013-07-24 13:45:17 +02:00
Heiko Kernbach 1acb903437 changed style of json import 2013-07-24 13:38:12 +02:00
Heiko Kernbach 89f2f36937 added display for server version/name @ footer 2013-07-24 12:41:58 +02:00
Heiko Kernbach d8bc2f61dc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-24 12:22:38 +02:00
Heiko Kernbach efdddf1152 aql templates now loading from local .json 2013-07-24 12:22:30 +02:00
Michael Hackstein 2cad3a20c9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-24 11:51:40 +02:00
Michael Hackstein 088faed40e GraphViewer: Added a View button to the Toolbox which will now display a beautified JSON-Format of the result 2013-07-24 11:51:21 +02:00
Heiko Kernbach fda27dd44a fixed navigation routes, render optimization aql 2013-07-24 11:49:36 +02:00
Heiko Kernbach d6d2fb2b07 small changes 2013-07-24 11:08:01 +02:00
Michael Hackstein 26b2f17fc6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-24 09:54:17 +02:00
Michael Hackstein d5f8780e12 GraphViewer: Added Zoom Controls to the UI 2013-07-24 09:51:41 +02:00
Michael Hackstein abcca43e0d GraphViewer: Added images for the Zoom-Controls 2013-07-24 09:49:06 +02:00
Jan Steemann 5fe1844ee1 replication tests 2013-07-23 15:03:59 +02:00
Jan Steemann bf12b6ec5a fixed journalSize 2013-07-23 11:57:56 +02:00
Jan Steemann 7e91193074 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-23 11:20:02 +02:00
Jan Steemann f8ef88692c fixed jslint warnings 2013-07-23 11:19:50 +02:00
Michael Hackstein af7ee1c137 Web-Interface: Renamed editor and editor2 to inputEditor and outputEditor, making the code more readable 2013-07-23 10:37:50 +02:00
Michael Hackstein 16001a1494 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-23 10:26:41 +02:00
Michael Hackstein cbc3366aa8 GraphViewer: Fixed NodeShaper tests for CommunityNodes that collapse neighbouring communities themselfes 2013-07-23 10:26:32 +02:00
Michael Hackstein 5945fa366a GraphViewer: The edges pointing to nodes inside a community are now rendered properly with respect to zoom 2013-07-23 10:25:37 +02:00
Michael Hackstein a5a661abca GraphViewer: CommunityNodes will now check if enough space is available and if there isn't expanded nodes will be colapsed again 2013-07-23 08:04:48 +02:00
Michael Hackstein cded8c87ed GraphViewer: Events are now piped though community nodes, contained nodes are now clickable 2013-07-23 07:57:47 +02:00
Jan Steemann 8c35c4ff14 fixed replication status display 2013-07-22 19:20:56 +02:00
Jan Steemann 5eee21e536 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-22 18:13:39 +02:00
Heiko Kernbach de4bf7cdc6 correct zindex for footer 2013-07-22 18:13:31 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Heiko Kernbach eac20f62e5 small bugfixes & optimizations 2013-07-22 18:11:15 +02:00
Heiko Kernbach ae2f20bde2 repl 2013-07-22 17:41:59 +02:00
Heiko Kernbach 19b0170625 repl 2013-07-22 17:36:15 +02:00
Heiko Kernbach 1f66dcec86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-22 17:05:58 +02:00
Heiko Kernbach ee3b61424a replication status 2013-07-22 17:05:50 +02:00
Michael Hackstein ce0df062dd GraphViewer: The expanded Community-Node now offers buttons to be removed and collapsed. Actions have to be tested 2013-07-22 16:18:00 +02:00
Michael Hackstein 5d7b3b86ee Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-22 14:48:35 +02:00
Michael Hackstein 081ff35f5d GraphViewer: All tests pass again 2013-07-22 14:48:28 +02:00
Michael Hackstein 48cc20842d GraphViewer: Adapted the tests for the forceLayouter to community-nodes design 2013-07-22 14:38:58 +02:00
Michael Hackstein e9acd17bf5 GraphViewer: Adapted NodeReducer tests to new community-node design 2013-07-22 14:22:29 +02:00
Michael Hackstein f6f5039e7d GraphViewer: Fixed a bug in the JSONAdapter, which caused the UI Tests to Fail, as the _id was not generated properly anymore 2013-07-22 14:14:24 +02:00
Heiko Kernbach 9ebf725322 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-22 14:04:36 +02:00
Michael Hackstein 01dab07c3b GraphViewer: Adapted Event tests to new community-node design 2013-07-22 13:56:18 +02:00
Michael Hackstein f200d8cef0 GraphViewer: Adapted EdgeShaper test to new community-node design 2013-07-22 13:49:23 +02:00
Michael Hackstein 80b67d6e47 GraphViewer: Adapted NodeShaper test to new community-node design 2013-07-22 13:29:26 +02:00
Michael Hackstein 3246e14888 GraphViewer: Adapted ArangoAdapter test to new community-node design 2013-07-22 13:25:13 +02:00
Michael Hackstein ec729ddc64 GraphViewer: Adapted abstractAdapter tests to new community-node design 2013-07-22 13:10:33 +02:00
Jan Steemann cdc57aea83 added arango.reconnect() method for arangosh 2013-07-22 09:57:39 +02:00
Michael Hackstein b02e8c2ecb GraphViewer: Fixed all tests for CommunityNode and added placeholders for Dissolve and Collapse buttons 2013-07-22 08:56:58 +02:00
Jan Steemann 741e42230a css fixes 2013-07-19 19:56:26 +02:00
Jan Steemann 6334430477 fixed filtering 2013-07-19 19:51:23 +02:00
Jan Steemann 2bd6aba9d1 fixed jslint warnings 2013-07-19 18:48:41 +02:00
Jan Steemann e184719169 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-19 17:22:14 +02:00
Jan Steemann 2a762ce1f7 replication logger tests 2013-07-19 17:22:06 +02:00
Thomas Richter 98ab65b791 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-19 16:21:01 +02:00
Thomas Richter 1c4c9a5f42 merged with devel 2013-07-19 16:20:12 +02:00
Michael Hackstein 9937736929 GraphViewer: Now edges are connected to the correct nodels inside the community 2013-07-19 16:17:36 +02:00
Michael Hackstein d9cc1f0a18 GraphViewer: Added the DomObserverFactory to the index.html 2013-07-19 16:16:46 +02:00
Thomas Richter 7df3e7cfbc filter widget also parses numbers boolen and null 2013-07-19 16:09:55 +02:00
Thomas Richter f9844f1654 filter widget also parses numbers boolen and null 2013-07-19 15:38:17 +02:00
Jan Steemann 522e983140 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-19 14:42:24 +02:00
Thomas Richter 0d3a66704f filter widget with logical operators 2013-07-19 14:23:48 +02:00
Jan Steemann 3ab117de67 added collection.first() and collection.last() 2013-07-19 14:21:46 +02:00
Michael Hackstein 2d8ff5b99f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-19 14:07:53 +02:00
Michael Hackstein 0e90daa6b4 GraphViewer: Added a wrapper around the MutationObserver for Cross-Browser support 2013-07-19 14:07:34 +02:00
Thomas Richter 9e26687baa work on filter 2013-07-19 12:24:18 +02:00
Heiko Kernbach 9406be7172 name change 2013-07-19 11:26:44 +02:00
Michael Hackstein 3edd6deac0 GraphViewer: Each communityNode now creats its own ForceLayouter 2013-07-19 11:26:22 +02:00
Thomas Richter 6a1ab815e9 filter in documentsView 2013-07-19 10:58:35 +02:00
Michael Hackstein ac5b224f9f GraphViewer: The communitynode now renders the size next to it 2013-07-19 10:34:10 +02:00
Michael Hackstein e1fd48c424 GraphViewer: The CommunityNodes are now able to expand and collapse themselfes. 2013-07-19 09:16:58 +02:00
Heiko Kernbach 5ce2b468c2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-18 18:19:59 +02:00
Heiko Kernbach 7bd6f028fd hover for foxx icons, removed welcome msg 2013-07-18 18:19:52 +02:00
Jan Steemann 3a0b472784 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-18 16:43:40 +02:00
Michael Hackstein 3adfe55284 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-18 16:41:32 +02:00
Michael Hackstein d7345b1ed7 GraphViewer: Moved dissolve -> getDissolveInfo() in the communityNode. dissolve will be used to trigger the event internally, where getDissolveInfo() just collects necessary infos 2013-07-18 16:41:25 +02:00
Jan Steemann 6239e51341 fixed jslint warning 2013-07-18 16:32:19 +02:00
Heiko Kernbach 6e2fd2989a trim check aql, clear in&outputs 2013-07-18 16:11:27 +02:00
Michael Hackstein ed3fdeef39 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-07-18 14:29:33 +02:00
Michael Hackstein 5bbc36e3f7 GraphViewer: The CommunityNode is now responsible for expansion.Right now its just a callback 2013-07-18 14:29:24 +02:00
Heiko Kernbach 58b7a2ddf3 event bugfix 2013-07-18 14:02:19 +02:00
Heiko Kernbach 2989e85a40 safari event bugfix 2013-07-18 13:57:21 +02:00
Heiko Kernbach 309e66d2f4 added queryfocus + round option 2013-07-18 13:24:52 +02:00
Heiko Kernbach faeba8e740 added focus + jslint 2013-07-18 12:38:59 +02:00
Jan Steemann e359dc29dd INCOMPATIBLE CHANGE: changed AQL user function namespace resolution operator from `:` to `::`
AQL user-defined functions were introduced in ArangoDB 1.3, and the namespace resolution
operator for them was the single colon (`:`). A function call looked like this:

    RETURN mygroup:myfunc()

The single colon caused an ambiguity in the AQL grammar, making it indistinguishable from
named attributes or the ternary operator in some cases, e.g.

    { mygroup:myfunc ? mygroup:myfunc }

The change of the namespace resolution operator from `:` to `::` fixes this ambiguity.

Existing user functions in the database will be automatically fixed when starting ArangoDB
1.4 with the `--upgrade` option. However, queries using user-defined functions need to be
adjusted on the client side to use the new operator.
2013-07-18 12:02:28 +02:00
Michael Hackstein 71a48ea13a GraphViewer: The communityNode now can render its bounding box. 2013-07-18 08:34:31 +02:00
Michael Hackstein 045f53c648 GraphViewer: Added a test for shaping of community 2013-07-18 07:51:56 +02:00
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 bdfe092523 GraphViewer: Added sections into the communityNode test, its getting quite complex now 2013-07-17 17:59:06 +02:00
Michael Hackstein 4cdf8f607b GraphViewer: The nodeShaper now lets the communityNode render itself, giving it required functions 2013-07-17 17:55:10 +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
Heiko Kernbach 9c12a30f14 documentview css 2013-07-17 11:12:27 +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
Michael Hackstein 96bf884002 GraphViewer: Added the communityNode.js to the index.html s.t. it is loaded in the webinterface 2013-07-17 08:02:48 +02:00
Heiko Kernbach 979034f3cf fixed css bug in documentView 2013-07-16 20:05:22 +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 6d4da13d4f GraphViewer: Updated the Toolbox icons. Now the text has exactly the same font. No rescaling anymore 2013-07-16 09:49:33 +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
Michael Hackstein ce36374690 GraphViewer: It is now possible to change the priority list on the fly 2013-07-15 15:10:58 +02:00
Heiko Kernbach 0783bb4cf8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-07-15 14:37:08 +02:00
Heiko Kernbach 0a11848a61 added basic setup for client-side login 2013-07-15 14:36:59 +02:00
Michael Hackstein 8f6fbb1a5a GraphViewer: Changed the karma configuration to .set as .configure has been deprecated 2013-07-15 14:19:02 +02:00
Michael Hackstein 14f997a223 GraphViewer: The communitiy nodes are now rendered with the reason why they are joined 2013-07-15 14:16:57 +02:00
Michael Hackstein fe2afc1883 GraphViewer: CommunityNodes now tell about the reason why they are joined if they know it 2013-07-15 13:51:13 +02:00
Michael Hackstein 3f12250c73 GraphViewer: The adapters now initialise the Abstract adapter with the content of prioList 2013-07-15 13:37:36 +02:00
Michael Hackstein 51358995ca GraphViewer: Propagated the new Node Reducer interface to the adapters and adapted tests 2013-07-15 13:10:41 +02:00
Michael Hackstein e23ada5627 GraphViewer: Changed the interface ofNode grouping in order to support priority lists 2013-07-15 11:53:06 +02:00
Michael Hackstein b82448a0d3 GraphViewer: Fixed all tests for loading the initial node. 2013-07-15 10:03:39 +02:00