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

2477 Commits

Author SHA1 Message Date
Heiko Kernbach adfdec9cb8 changed style of validation in modal views 2014-08-14 17:19:16 +02:00
Heiko Kernbach 6070acb954 validation now on focusout instead of keyup event 2014-08-14 16:59:50 +02:00
Heiko Kernbach c62b81f547 enabled pretty printing in js shell by default 2014-08-14 14:53:33 +02:00
Heiko Kernbach 4979513dc8 added validation rules for modal views 2014-08-14 14:03:15 +02:00
Jan Steemann ab080d8b73 added derived files 2014-08-13 16:02:19 +02:00
Heiko Kernbach 34ee4517ab added more regex validation 2014-08-12 18:06:23 +02:00
Heiko Kernbach 00761a36e6 merge 2014-08-12 15:11:28 +02:00
Heiko Kernbach 039f7884aa added functionality to validate modals content 2014-08-12 15:11:14 +02:00
Frank Celler f6e242039d relaxed % and escaping 2014-08-12 14:53:59 +02:00
Heiko Kernbach db04ef88a5 changed the look of the import query feature 2014-08-11 18:18:20 +02:00
Heiko Kernbach c4006bdec8 _from and _to links in documenView are now clickable and redirecting to their destination 2014-08-11 17:08:38 +02:00
Heiko Kernbach b97a3d3221 added autofocus for modals 2014-08-11 16:16:30 +02:00
Heiko Kernbach 679db54c5a merge 2014-08-11 15:54:58 +02:00
Heiko Kernbach 46657fee1d changed look and feel of document editor + delete function added 2014-08-11 15:54:41 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Heiko Kernbach 836e7f23bd added a bug where query collection not recognizing current user 2014-08-08 14:25:45 +02:00
Heiko Kernbach d6f62ac834 js/collections/arangoQueries.js 2014-08-08 14:25:13 +02:00
Heiko Kernbach cc440aaaaa jslint 2014-08-08 13:28:31 +02:00
Heiko Kernbach 0c716ab129 modified query collection so that name of query must be unique 2014-08-08 13:27:17 +02:00
Heiko Kernbach cbcca7cb51 merge 2014-08-08 13:04:56 +02:00
Heiko Kernbach 124906435e added import/export feature. aql queries now stored in user collection 2014-08-08 13:04:39 +02:00
Heiko Kernbach 2fe601e97d added event when document cannot be saved 2014-08-08 13:00:34 +02:00
Michael Hackstein d64a45e23d Added generated swagger files 2014-08-07 14:58:05 +02:00
Michael Hackstein 8dde9e7531 Fixed a bug in the automatic retry collection, it does not show the prompt for the user to enter cluster credentials 2014-08-07 14:53:03 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Heiko Kernbach e96a51f44d merge 2014-08-06 14:29:34 +02:00
Heiko Kernbach 64f3dba10c query view frontend 2014-08-06 14:28:54 +02:00
Jan Steemann dbe107ce65 jslint 2014-08-06 13:50:21 +02:00
Jan Steemann 55e0622e06 throw "real" exceptions when passing bad parameters to update/replace/remove/exists 2014-08-06 13:38:33 +02:00
Michael Hackstein 919f713ca5 Added an upgrade cluster button when cluster is shutdown. And further adoption to asynchronous code 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/clusterDownView.js

Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
 2014-08-06 11:48:58 +02:00
Heiko Kernbach abf221ed82 merge 2014-08-06 09:36:13 +02:00
Heiko Kernbach 2d1c62903d prep for import and export of aql queries 2014-08-06 09:35:45 +02:00
Michael Hackstein 4a815d6730 Added automatic retry file to karma tests 2014-08-06 09:20:55 +02:00
Michael Hackstein ba08d7e5fd Fixed a bug in cluster dashboard, which made it impossible to view the dashboard for a multi machine cluster. #883 2014-08-06 09:18:28 +02:00
Michael Hackstein 53abe18fe5 Fixed cluster dashboard on server failure 2014-08-06 09:18:19 +02:00
Michael Hackstein b3dedc10c9 Fixed a redircetion bug (Dead Coordinator -> Revive Coordinator -> Dead Coordinator -> Revive Coordinator) did not load cluster interface twice 2014-08-06 09:18:00 +02:00
Michael Hackstein 15f535ed61 Fixed a bug with retrying whenever the connection was lost 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
 2014-08-06 09:17:34 +02:00
Michael Hackstein 2a9c88e85b Added unreachable view 2014-08-06 09:16:50 +02:00
Michael Hackstein db5b7c2086 If no coordinator is available the interface will tell you. Screen needs to be prettified. Still some issues when interface comes back, null-pointer exceptions 2014-08-06 09:16:36 +02:00
Michael Hackstein 7aa7697ded Continued implementing async functionality in cluster dashboard 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-08-06 09:16:08 +02:00
Michael Hackstein 06e9a949d5 Cluster Servers and Coordinators are now working async. It is now possible to contact a cluster even if some of the coordinators are down 2014-08-06 09:14:42 +02:00
Michael Hackstein 9d85b25674 Started moving synchronous cluster implementation to asynchronous one. Synchronous is broken on some browsers as soon as one coordinator is dead 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-08-06 09:14:28 +02:00
Jan Steemann c7e2ccee51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-08-05 10:13:03 +02:00
Jan Steemann 3a4cf3eac5 added derived file 2014-08-05 10:12:32 +02:00
Heiko Kernbach 21629e8284 karma jslint 2014-08-01 20:44:13 +02:00
Heiko Kernbach d3af798a5c karma jslint error 2014-08-01 20:40:18 +02:00
Heiko Kernbach 342c8f00d8 added missing karma config entries 2014-08-01 20:38:47 +02:00
Heiko Kernbach b477843b27 added model, collection, view, css for custom query storage 2014-08-01 20:20:01 +02:00
Heiko Kernbach bef094db2e merge 2014-08-01 18:20:44 +02:00
Heiko Kernbach acecadb2e1 jslint fixes 2014-08-01 18:20:28 +02:00
Heiko Kernbach 9ead031a73 added visual feedback for user editing a document or edge 2014-08-01 18:16:06 +02:00
Max Neunhoeffer 390f0fe605 Implement distributeShardsLike 2014-08-01 17:05:04 +02:00
Heiko Kernbach 5700394a69 fixed specs for documentsViewSpec 2014-08-01 15:15:56 +02:00
Heiko Kernbach 3b51bbe26f fixed and cleaned up tooltips 2014-08-01 15:01:22 +02:00
Heiko Kernbach 5abdc1e4b4 removed console log 2014-08-01 14:39:28 +02:00
Heiko Kernbach ad318b0ab9 fixed karma spec 2014-08-01 14:35:32 +02:00
Heiko Kernbach 1f41d215fd fixed divider bug in dbSelectionView templaet 2014-08-01 14:26:15 +02:00
Heiko Kernbach ff3d95746f changed keywords in aql-theme for ace editor 2014-07-31 19:10:49 +02:00
Heiko Kernbach 4a3796186d added new functions and keywords into aql theme for ace editor 2014-07-31 18:40:41 +02:00
Heiko Kernbach 198b152970 fixed dbselectionviewspec 2014-07-31 18:25:33 +02:00
Heiko Kernbach cee3035d70 manage dbs: removed unnecessary divider if not needed 2014-07-31 17:53:09 +02:00
Heiko Kernbach ad51f9797f changed Graph Management label to Graphs 2014-07-31 17:47:30 +02:00
Heiko Kernbach 134975f5f1 changed copyright to arangodb gmbh 2014-07-31 17:37:46 +02:00
Michael Hackstein 83d49c0d9d Fixed a minor bug where it was not allowed to remove a vertex from a graph by its key 2014-07-30 09:41:57 +02:00
Alan Plum 0f5c65e636 gharial: added missing body params. 2014-07-25 16:23:34 +02:00
Alan Plum edccd22286 Fixed aardvark config not showing falsey defaults and formatting. 2014-07-25 15:36:45 +02:00
Heiko Kernbach 83ccb3c339 changed lib to minified version 2014-07-24 14:14:05 +02:00
Heiko Kernbach a09f66cb4f fixed select2 modal bug 2014-07-24 14:06:06 +02:00
Heiko Kernbach 796b407d51 moved back to previous version 2014-07-24 14:05:51 +02:00
Heiko Kernbach e7f4d396a6 new select2 version, fixed a bug where using backspace results in frontend inusability 2014-07-24 10:38:01 +02:00
Jan Steemann 2943ac073c added derived file 2014-07-24 09:15:13 +02:00
Frank Celler 5f695d327b Merge pull request #942 from triAGENS/enjoi-all-the-apps 
Convert gharial and aardvark to joi
 2014-07-23 20:25:57 +02:00
Alan Plum 28cd18a8dd Linting. 2014-07-23 19:41:59 +02:00
Alan Plum 9e13e84b31 Workaround for booleans-as-numbers (thank you, PHP). 2014-07-23 17:05:04 +02:00
Alan Plum 760938c238 Removed unused pathParam to prevent breakage. 2014-07-23 11:20:35 +02:00
Alan Plum 9d752c951f Converted gharial and aardvark to joi. 2014-07-23 11:20:35 +02:00
Max Neunhoeffer a8e3236560 Snapshot, legend cache started. 2014-07-22 16:59:19 +02:00
Michael Hackstein 330e73289a The application view will now always sort your apps by name 2014-07-22 13:35:49 +02:00
Michael Hackstein 472240948a Fixed JSLint warning in gharial 2014-07-21 14:41:34 +02:00
Michael Hackstein 05a6760adb Fixed return code in gharial, when trying to delete a non existing vertex collection. 2014-07-21 10:23:54 +02:00
Michael Hackstein 2999212360 Added a more elaborate spy on the App in cluster view tests 2014-07-18 16:59:55 +02:00
Michael Hackstein dc2ba5391b Fixed indention of spec 2014-07-18 16:53:17 +02:00
Michael Hackstein 135a447c67 Removed unnecessary deletion of values in tests. Might have sideeffects 2014-07-18 16:52:56 +02:00
Michael Hackstein b13149ea5f Removed pointless logging 2014-07-18 15:12:01 +02:00
Michael Hackstein f0fc951089 Impoved spies in routerSpec and fixed indention in router 2014-07-18 14:57:58 +02:00
Michael Hackstein 49ef4a57b7 Cleaned up aardvark tests. 2014-07-18 13:20:04 +02:00
Michael Hackstein 6481c3217f Fixed ordering of error responses in gharial 2014-07-18 10:53:52 +02:00
Michael Hackstein 6736098790 Improved spies in router spec 2014-07-18 09:11:27 +02:00
Michael Hackstein ac84c9f8ef Cleaned up window.App after test cases 2014-07-17 16:38:18 +02:00
clintwood (Office) abe72bec38 AQL Syntax: Added AQL data modification keywords to syntax highlighting. 2014-07-17 15:54:56 +02:00
clintwood (Office) fb0a309b3c AQL Editor: Query only on selected text if a selection exists. 2014-07-17 15:54:47 +02:00
clintwood (Office) f28e829586 Fix: Save (Update) on AQL query editor will now persist changed query text. 2014-07-17 15:47:51 +02:00
Michael Hackstein 679996d5b4 Properly cleaning up the modal dialog after tests now 2014-07-16 15:39:45 +01:00
Michael Hackstein 85f3c7a447 Added some tests for applications overview. 2014-07-16 15:39:16 +01:00
Michael Hackstein 5df8cf0896 Fixed a minor mistake where it was not possible to install a foxx App 2014-07-16 15:11:43 +01:00
Michael Hackstein 06599c6e41 Added some more tests for gharial adapter 2014-07-16 13:33:21 +01:00
Michael Hackstein 1d824226e7 Added test for te version check to not trigger the update dialog if version is devel 2014-07-16 13:32:57 +01:00
Michael Hackstein b23e0e6cbb Readded deactivated test for moduarity joiner in frontend. 2014-07-16 13:31:57 +01:00
Michael Hackstein ae68358dec Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-16 12:51:34 +01:00
Michael Hackstein 871db072e7 Added tests for gharial error return codes. Fixed a bug pn false return code on the way 2014-07-16 11:04:39 +01:00
gschwab 2e878bfde0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-16 09:31:17 +02:00
gschwab ea1d653836 fixed jslint 2014-07-16 09:31:08 +02:00
Frank Celler 70825ae10a fixed V8 compiler for ARM 
Conflicts:
	CHANGELOG
 2014-07-15 20:30:16 +02:00
Frank Celler 6ec2cf2a3c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-15 20:20:42 +02:00
Michael Hackstein 3ecae27acd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-15 16:57:33 +01:00
Michael Hackstein db33dd22d2 Fixed a minor bug in gharial where there was no correct error code was thrown when trying to store a vertex in a non existing graph. Also allowed the _create method of graph module to take options like waitForSync 2014-07-15 16:57:24 +01:00
gschwab 9b22e50648 added some css, html and checks 2014-07-15 13:14:33 +02:00
Heiko Kernbach 3293208b6a fixed graphviewer navigation 2014-07-11 13:54:48 +02:00
scottashton ba2d7a7745 collapse edge definitions when graph is created 2014-07-11 13:30:03 +02:00
Frank Celler cf81e3ff00 generate .cpp file instead of .c file 2014-07-10 19:13:12 +02:00
Michael Hackstein e43caaea0d FIxed tests for cluster down view 2014-07-10 16:39:49 +02:00
Michael Hackstein 6f017e2920 Added a specific cleanup when deleting cluster plan or midifying it 2014-07-10 11:41:31 +02:00
Michael Hackstein ca959a0653 Added a test that the graph viewer is not loaded for graphs without edge definitions 2014-07-10 09:51:33 +02:00
Michael Hackstein a6bf48831b Fixed #941. Showing a collection did send a count request, as well as a fullCount for the query. fullCount in this case is superflous and has been removed. On the way fixed an issue with the number of documents not updating while filtering. 2014-07-10 09:33:05 +02:00
Michael Hackstein 9beab0aaff It is no longer possible to view graphs having no edge definitions 2014-07-09 16:40:36 +02:00
Michael Hackstein 47c8f709a9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-09 15:15:39 +02:00
Michael Hackstein 5d90ffef37 Fixed parameter types for boolean query parameter. Fixed return code for edge creation. 400 is thrown on invalid edge, 404 is thrown if collection or graph not found 2014-07-09 15:15:25 +02:00
scottashton c6a5425930 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-09 14:43:15 +02:00
scottashton 267c8ba451 minor fixes in gharial and ahuacatl 2014-07-09 14:43:06 +02:00
Michael Hackstein 74c8752d97 Fixes false positioning of edge #894. Tested in FF, Chrome, Safari, IE11 (all newest versions) 2014-07-09 12:19:22 +02:00
Michael Hackstein 1f795fec66 Improved gharial and general graph documentation. Gharial now documents waitForSync, keepNull and if-match 2014-07-08 17:18:15 +02:00
Michael Hackstein f763f0aa13 Added an error for the graph module. It will be thrown on the attempt to add an orphan collection that is already used. Also alloed orphan collections for restrictions in fluentAQL 2014-07-08 13:53:39 +02:00
Michael Hackstein aeacb9279a Fixed a problem with waitForSync parameter. Returned type is string, not boolean as expected 2014-07-08 13:08:09 +02:00
Michael Hackstein 3f6e1c3555 Unified gharial error responses with normal API 2014-07-08 10:46:18 +02:00
Michael Hackstein b67a016b4c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-08 08:03:12 +02:00
Michael Hackstein 3f7e2a7b76 Fixed failing gharial examples 2014-07-08 08:03:03 +02:00
Frank Celler 793f7e8859 generated files 2014-07-07 18:46:39 +02:00
Michael Hackstein 7383fc4fdd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-07 15:18:39 +02:00
Michael Hackstein 72a9b7e5aa Added waitForSync support for creation of vertices and edges in gharial 2014-07-07 15:18:35 +02:00
scottashton 64a72ed12b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-07 14:22:41 +02:00
scottashton c5bfe5a33c changed gharial to match php api 2014-07-07 14:21:58 +02:00
Michael Hackstein a9a8efb14b Fixed documentation of gharial. Status code assertion did fail due to waitForSync parameter 2014-07-07 09:51:05 +02:00
Michael Hackstein 4701ad8635 Fixed tests for document view. Frontend should be green again 2014-07-07 09:41:39 +02:00
Michael Hackstein 8fe6f0260d Fixed sorting of documents to use internal total function 2014-07-07 09:31:54 +02:00
Michael Hackstein c588a1ca4c Fixed tests for documents view in admin interface. there was some functionality missing thx @jsteemann 2014-07-07 09:17:30 +02:00
Jan Steemann e0920209f7 added generated file 2014-07-06 15:27:02 +02:00
Frank Celler 40edb310f2 generated files 2014-07-06 13:43:53 +02:00
Jan Steemann c12df38eb2 fixed broken examples 2014-07-06 02:25:19 +02:00
Jan Steemann 0b4040265f added derived files 2014-07-06 00:46:03 +02:00
Jan Steemann 64916fd9d8 next attempt 2014-07-05 16:25:35 +02:00
Jan Steemann dce300224c attempt to fix test 2014-07-05 16:19:10 +02:00
Jan Steemann aba9fd431f web interface didn't update the view after filtering documents 2014-07-05 14:43:30 +02:00
Jan Steemann cbf7e27f68 added derived files 2014-07-03 17:12:56 +02:00
Michael Hackstein 202deaae85 Fixed issues in gharial module. By default the do not wait for sync http codes are returned. You can now optionally send waitForSync true to all modifying endpoints 2014-07-03 10:53:18 +02:00
Michael Hackstein 7b22c0c2a5 Added a correct 404 return code to gharial when trying to remove a vertex/edge which does not exists. Also added tests for return codes 2014-07-02 15:03:06 +02:00
Michael Hackstein 75059ac757 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-02 14:16:28 +02:00
Michael Hackstein 0ad3a34266 Added a simple get graph function to gharial. 2014-07-02 14:07:12 +02:00
Michael Hackstein 2fd21ceac5 Improved router spec. It now checks for correct width send on resize 2014-07-02 10:29:56 +02:00
Jan Steemann eae94f97a8 removed dead code 2014-07-02 00:21:58 +02:00
Jan Steemann 0a230b77e3 jshund 2014-07-02 00:17:25 +02:00
Michael Hackstein aac1d3ecde Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-01 16:52:21 +02:00
Michael Hackstein fd635bddc0 Reactivated and fixed cluster frontend tests 2014-07-01 16:52:15 +02:00
Jan Steemann a5cf53d417 fixed examples 2014-07-01 16:48:47 +02:00
Alan Plum 1624c6a1b8 Formatting. 2014-07-01 15:08:38 +02:00
Alan Plum ab4e208e7d Simplified config value validation in aardvark. 2014-07-01 14:41:03 +02:00
Alan Plum 1d497135cf Allow specifying config options when mounting apps in aardvark. 2014-07-01 14:35:08 +02:00
Jan Steemann 815bb8480a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 13:12:47 +02:00
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
gschwab 0d9ef4892c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 11:47:38 +02:00
gschwab 8e3b800a69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-07-01 11:47:28 +02:00
Michael Hackstein 8e1680340d Fixed indention and minor errors in cluster specs 2014-07-01 11:35:01 +02:00
scottashton fe8665d682 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 10:31:57 +02:00
scottashton 8c211c41c2 more tests 2014-07-01 10:31:53 +02:00
Michael Hackstein a387964ca2 Added Spec files to make JSLINT and fixed all errors in these files 2014-07-01 09:34:01 +02:00
scottashton 422c102e34 tests for graph model 2014-07-01 09:12:10 +02:00
Michael Hackstein 11a2f23c2b Fixed a bug in graph viewer to list the label attribute 2014-06-30 17:19:13 +02:00
Michael Hackstein 9762c20424 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 16:51:56 +02:00
Michael Hackstein 7944301f2e Fixed requesting of random vertices in graph viewer. Warning for empty graph will now displayed only if the graph is really empty, not on bad luck 2014-06-30 16:51:29 +02:00
scottashton ed7ef4fa80 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 16:27:56 +02:00
scottashton 53a676e387 graphManagement covered 2014-06-30 16:27:52 +02:00
gschwab 58ea71bba1 removed comments 2014-06-30 16:19:58 +02:00
Lucas Dohmen 13bc4dfacd Fix for more than one path param in the swagger docs 2014-06-30 16:17:00 +02:00
Michael Hackstein 2b12499f40 Added optional drop collection path parameters to gharial 2014-06-30 16:03:31 +02:00
scottashton ec5551a131 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 16:00:55 +02:00
scottashton 10d83578b0 fixed small bug in graphManagement 2014-06-30 16:00:51 +02:00
Michael Hackstein 2bb8ace423 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 15:28:18 +02:00
Michael Hackstein d94de0af94 Changed capture of select collection dialog in graph viewer for multi collection graphs 2014-06-30 15:28:12 +02:00
gschwab 32f997bf8f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 15:22:52 +02:00
gschwab be7a6c1176 fixed toggle error 2014-06-30 15:22:46 +02:00
scottashton 320b650333 jslinted tests 2014-06-30 15:12:42 +02:00
scottashton 68bd5d22e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 14:53:18 +02:00
scottashton 8622b67d19 more tests for graph management 2014-06-30 14:53:13 +02:00
Jan Steemann 82f2e3d679 added derived file 2014-06-30 13:54:43 +02:00
scottashton 300c4c84b1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 12:28:57 +02:00
scottashton 4f947bb80a more tests for graphManagement 2014-06-30 12:28:53 +02:00
gschwab 63caa46d74 ended deleting old graph view 2014-06-30 11:49:42 +02:00
gschwab 2b86e84243 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 11:42:18 +02:00
gschwab a02c483f49 continued deleting old graph view 2014-06-30 11:42:12 +02:00
scottashton 0c283ccb12 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 11:37:03 +02:00
scottashton 618bc28a24 setFromAndTo Test 2014-06-30 11:36:58 +02:00
gschwab e9094f8aa6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 11:36:24 +02:00
gschwab b41222a872 continued deleting old graph view 2014-06-30 11:36:19 +02:00
Michael Hackstein f7854c6d70 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 11:36:16 +02:00
Michael Hackstein b7fb011de3 Fixed a bug in gharial adapter for new graph viewer. Expected results to not be encapsulated, but they are 2014-06-30 11:36:12 +02:00
gschwab 234f1e5e33 continued deleting old graph view 2014-06-30 11:35:51 +02:00
scottashton ba0a0ba91e setFromAndTo Test 2014-06-30 11:30:38 +02:00
gschwab 69c2eb78a5 started deleting old graph view 2014-06-30 11:24:16 +02:00
Michael Hackstein cd8079ed59 Added some more whitespace on left and right. This allows to use scrollbars without triggering resizing 2014-06-30 11:10:00 +02:00
Michael Hackstein 874343697e Fixed resizing tests 2014-06-30 11:09:07 +02:00
Michael Hackstein 8131c5a9fc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 10:26:20 +02:00
Michael Hackstein f43a45f6c1 Added resizing to new version of graph viewer 2014-06-30 10:26:17 +02:00
gschwab 379555715c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/test/specs/views/graphManagementViewSpec.js
 2014-06-30 10:19:45 +02:00
gschwab 1ceb929483 karma tests changed 2014-06-30 10:17:00 +02:00
scottashton 466e2764d0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 10:13:35 +02:00
scottashton 9ca5e2965a tests for graphManagementView 2014-06-30 10:13:31 +02:00
Michael Hackstein 15d6414682 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 10:00:43 +02:00
Michael Hackstein a5e530ea0a Added a useful dialog to select vertex and edge collection to store elements in in GraphViewer 2014-06-30 10:00:39 +02:00
gschwab fc66c71c19 test changed 2014-06-30 09:50:04 +02:00
Jan Steemann 0860012140 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-27 19:11:50 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
scottashton a7d4acee7c removed dead code 2014-06-27 17:34:41 +02:00
scottashton 1912250fa5 inserted validation of graphname 2014-06-27 16:43:58 +02:00
scottashton a1910dae6f combined edit and create graph and fixed layout bugs in edit graph 2014-06-27 16:30:44 +02:00
scottashton 96e798ee17 enriched the create graph modal 2014-06-27 15:23:50 +02:00
gschwab 6f36046fc8 edit graph 2014-06-27 14:49:45 +02:00
gschwab 9d7174e842 edit graph 2014-06-27 12:02:39 +02:00
gschwab 6c9bcf30c3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-27 11:11:20 +02:00
gschwab e6520a6bc0 edit graph 2014-06-27 11:11:14 +02:00
Thomas Schmidts 148f400991 Changed some (sub)chapters and fixed spelling errors 2014-06-27 11:02:10 +02:00
Michael Hackstein ec5a8eec1f Fixed tests for gharial adapter. They did use the old format 2014-06-26 16:55:45 +02:00
Michael Hackstein 8664ab279a Added rudimentary implementation for storing vertices and edges in graph viewer. Dialog has to be improved and error handling required 2014-06-26 16:39:52 +02:00
Michael Hackstein dc7ffb4efb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:13:38 +02:00
Michael Hackstein 1739339883 Addapted gharial adapter to new traversal result 2014-06-26 16:13:31 +02:00
gschwab a205a49f1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-26 15:57:53 +02:00
gschwab 95e60c069b edit graph 2014-06-26 15:54:50 +02:00
scottashton 357be2cbbe adjusted tests for new graph management 2014-06-26 15:51:11 +02:00
scottashton d610cf9107 finally managed to disable the enter button in create graph modal 2014-06-26 15:10:23 +02:00
scottashton d3657a6dec Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 14:05:25 +02:00
scottashton daceb0e1b1 preselct defintions if available 2014-06-26 14:05:20 +02:00
Frank Celler 13f91392bb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 12:51:00 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
gschwab caf54c1bbf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-26 12:44:47 +02:00
gschwab 059093c7a4 add graph - iteration fixed 2014-06-26 12:43:12 +02:00
scottashton 1bc4864090 merged 2014-06-26 12:01:17 +02:00
scottashton de0da1e7b7 changed signature of the traversal functions 2014-06-26 11:55:35 +02:00
Michael Hackstein 8627815c26 The GraphViewer now starts with _key colouring and labeling 2014-06-26 11:55:00 +02:00
gschwab c35677b0a1 edit graph 2014-06-26 11:13:04 +02:00
gschwab 8440bc916e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 11:07:40 +02:00
gschwab c941cfa76c edit graph 2014-06-26 11:07:35 +02:00
Michael Hackstein 97309a837b The graphviewer will now start with a random vertex 2014-06-26 10:54:07 +02:00
Michael Hackstein 4d1357c465 I broke the build and fixed it. Sorry... 2014-06-26 10:31:12 +02:00
Michael Hackstein f2705d98cb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 10:17:10 +02:00
Michael Hackstein 5dbf4d1306 Started adding the graph viewer into the new graph management overview. Right now it is possible to show a graph by selecting a start node by its id. Not yet working: Search, start with random, create vertices and edges 2014-06-26 10:17:00 +02:00
gschwab 1d53c8841f removed dead code 2014-06-26 10:09:00 +02:00
gschwab 00f687452c graph management - multi edge definitions 2014-06-26 09:50:58 +02:00
gschwab 3d1a7f35b5 graph management - multi edge definitions 2014-06-26 09:37:28 +02:00
scottashton ae53a8c7c9 fixed tests 2014-06-26 09:34:56 +02:00
Michael Hackstein b9ae84cfad Added click events to all graph tiles in management. Needed later to integrate the graph viewer 2014-06-26 09:34:44 +02:00
scottashton 25ae2ced5e merge conflict 2014-06-26 09:08:31 +02:00
scottashton a8c4af2921 graph creation works 2014-06-26 09:07:12 +02:00