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

2326 Commits

Author SHA1 Message Date
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
Michael Hackstein 68147bb32b Added some more tests for gharial adapter 2014-06-26 09:06:20 +02:00
Michael Hackstein c52c9d3a35 Test coverage of gharial adapter controls is now 100% 2014-06-26 08:59:34 +02:00
Michael Hackstein d9e0affdfa Implemented & tested the settings menu for multi collection graph module. Last thing missing: Ask the user about the collection where he wants to create vertices and edges 2014-06-26 08:38:27 +02:00
gschwab f61841283d jslint 2014-06-26 08:33:43 +02:00
gschwab 25db4d8426 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-26 08:33:05 +02:00
gschwab 69f7692023 graph management - multi edge definitions 2014-06-26 08:29:09 +02:00
Michael Hackstein 881f5bfd65 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 08:03:20 +02:00
scottashton 66860ac120 deactivated some tests 2014-06-25 17:44:59 +02:00
scottashton 3a9b88c1a7 accidentaly removed content from modalView.js 2014-06-25 17:30:25 +02:00
scottashton d850c6922b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-25 17:23:31 +02:00
scottashton 4cd8975c2b gm create modal looks as it should but is not working properly 2014-06-25 17:23:26 +02:00
Frank Celler 9bfaeeebd0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 17:22:30 +02:00
Frank Celler 87e1e16ad9 execute setup for system apps 2014-06-25 17:22:24 +02:00
gschwab 165daa0c1e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/graphManagementView.js
 2014-06-25 16:33:32 +02:00
gschwab 51389fcfd6 fixed graph managment 2014-06-25 16:32:23 +02:00
Michael Hackstein 8f380d3b5f Added multi collection support to gharial adapter of graph viewer. Internally it is now able to do that, time to write new dialogs (user has to select which collections he want to use when creating vertices and edges 2014-06-25 16:17:35 +02:00
Thomas Schmidts cba9529153 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 16:15:36 +02:00
scottashton 9d0399ee0e new templates for graph management 2014-06-25 16:08:21 +02:00
scottashton 235a438c0c finished documentation of complexity 2014-06-25 15:51:41 +02:00
Michael Hackstein 1f614ed1b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 15:50:41 +02:00
Thomas Schmidts 9d26904ffc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 15:18:13 +02:00
Thomas Schmidts f005d676cb Some changes in the code documentation 2014-06-25 15:10:13 +02:00
gschwab d7520ce53c jslint 2014-06-25 15:02:47 +02:00
gschwab a9e5df49d6 jslint 2014-06-25 15:00:51 +02:00
Thomas Schmidts f7be757b0b Some changes in the code documentation 2014-06-25 14:57:29 +02:00
Alan Plum 91cfd860b2 Added other system apps to jslint task. 2014-06-25 14:48:24 +02:00
gschwab 71621b9d4e fixed tests 2014-06-25 14:47:03 +02:00
Michael Hackstein a0a1534861 Fixed all tests for gharial adapter. It is now able to handle single collection graphs. Now adding multiple collection graphs 2014-06-25 14:28:40 +02:00
Michael Hackstein 12ad6f939b Started with tests and implementation of gharial adapter for the graph viewer. WIP 2014-06-25 14:21:26 +02:00
gschwab d7909d2035 jslint 2014-06-25 11:22:15 +02:00
gschwab 834a4a5c7c docu feedback integrated 2014-06-25 11:20:24 +02:00
gschwab 466d13ddd2 new graph management 2014-06-25 09:14:45 +02:00
gschwab e88a788499 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 17:35:28 +02:00
Jan Steemann 4c00cc38fd added derived files 2014-06-24 17:33:45 +02:00
gschwab 46a9176132 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 17:28:44 +02:00
gschwab 4f908c9675 new graph management 2014-06-24 17:28:39 +02:00
Michael Hackstein ac014bbfe0 Fixed a bug in gharial which was not allowed to create orphan collections during graph creation 2014-06-24 17:27:47 +02:00
gschwab c42c9e3253 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 17:02:40 +02:00
gschwab 383e254414 new graph management 2014-06-24 17:02:36 +02:00
scottashton c46a916762 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:16:29 +02:00
scottashton b5aeea1109 fixed jslint 2014-06-24 16:16:25 +02:00
Jan Steemann cf14609727 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:12:07 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
gschwab f059dca594 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:09:46 +02:00
gschwab 8e514b2435 new graph management 2014-06-24 16:09:41 +02:00
scottashton bbb7068a08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:02:46 +02:00
scottashton e4f23d2b23 graph management 2014-06-24 16:02:40 +02:00
Frank Celler 840950c6a0 fixed printing of functions and example generation 2014-06-24 15:32:43 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
gschwab 44c11d3846 graph management: links changed 2014-06-24 14:08:48 +02:00
gschwab bab8ff0bde changing graph management - initial checkin 2014-06-24 14:06:27 +02:00
Alan Plum d50bd571f7 Trimmed line length. 2014-06-24 13:24:32 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
gschwab e049f85b44 docu 2014-06-24 11:54:42 +02:00
Jan Steemann 8d8dfe5cd0 added derived files 2014-06-24 00:44:25 +02:00
Michael Hackstein 7e3d0be402 Beautified examples of gharial 2014-06-23 15:53:31 +02:00
gschwab 56d8db54aa docu 2014-06-23 15:14:16 +02:00
Frank Celler 34908e450b hidden for http examples 2014-06-23 14:04:16 +02:00
gschwab 0b09442ad9 typos 2014-06-23 13:44:04 +02:00
gschwab 35b645ba1a deleted print O.o 2014-06-23 13:23:09 +02:00
gschwab 19191b5a1b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:20:18 +02:00
gschwab 4651fbd34a deleted print 2014-06-23 13:20:12 +02:00
Michael Hackstein 658fa5cc25 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 13:18:06 +02:00
Michael Hackstein 273eaf95fb Added graph specific deprecation information to DEPRECATED.md 2014-06-23 13:17:20 +02:00
scottashton fa2084ea9b fixed bug in commonPorperties, now attributes with the value of 'false' are included in result, fixed js shell to full general-graph support 2014-06-23 11:37:43 +02:00
Frank Celler c21c1d9a46 added underscore 2014-06-23 10:44:16 +02:00
gschwab 5406db3dc8 renamed _getToVertex(...) -> _toVertex(..) 2014-06-23 10:16:05 +02:00
gschwab 69df68c54e renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:47:48 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Heiko Kernbach 07f01f90d3 jslint 2014-06-20 17:21:54 +02:00
Heiko Kernbach 8c66875f97 alerting user now when newest version of github foxx app is already installed 2014-06-20 17:03:24 +02:00
gschwab 34cd589908 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:19:04 +02:00
gschwab 28b5f27ca6 error added 2014-06-20 16:18:58 +02:00
Heiko Kernbach 6afee10309 jslint 2014-06-20 16:11:43 +02:00
Heiko Kernbach fcb4d7c513 merge 2014-06-20 16:09:33 +02:00
Heiko Kernbach 7aaaa88f85 added github update for foxx applications via frontend 2014-06-20 16:09:13 +02:00
Michael Hackstein 1db8391e42 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 16:02:00 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
Michael Hackstein 707c79d5a5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 15:07:29 +02:00
Frank Celler 5ac431a453 generated files 2014-06-20 15:06:18 +02:00
Heiko Kernbach 5ef874f8f3 merge 2014-06-20 14:58:30 +02:00
Michael Hackstein 0eff0753e8 Started improving the layout of FluentAQL Documentation in general graph module 2014-06-20 14:57:04 +02:00
Heiko Kernbach ac9be731aa added new foxx route for git information about foxx app 2014-06-20 14:54:21 +02:00
Frank Celler 44b1421f82 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 14:48:26 +02:00
Jan Steemann be0b4b8c6e remove definePeriodic 2014-06-20 14:45:14 +02:00
Frank Celler af109c73ca Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-20 14:41:13 +02:00
Jan Steemann b9c688d117 removed doxygen comments 2014-06-20 14:39:05 +02:00
Jan Steemann e51dcdb2cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-06-20 13:39:51 +02:00
Frank Celler 4458393655 added missing description 2014-06-20 13:33:52 +02:00
Heiko Kernbach 39cf260ff2 better usability for foxx github installer 2014-06-20 11:40:38 +02:00
Heiko Kernbach 6191403181 jslint 2014-06-20 10:35:40 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
gschwab dbe0cbbf7f renamed _directedRelationDefinition(...) -> _directedRelation(..) 2014-06-20 09:01:35 +02:00
gschwab ff3e0442a9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 08:57:04 +02:00
gschwab 639e657897 renamed _undirectedRelationDefinition(...) -> _undirectedRelation(..) 2014-06-20 08:56:59 +02:00
Michael Hackstein 79ad6f60af Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 08:38:11 +02:00
Michael Hackstein 407496c111 Added new version of traversal and general graph to web ui shell. Needs testing 2014-06-20 08:38:07 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Michael Hackstein b0f176c37a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 17:16:48 +02:00
Frank Celler 8cd9e257db ignore devel version for version check 2014-06-18 17:06:15 +02:00
Michael Hackstein ff709e92b6 Fixed examples for graph http module 2014-06-18 16:50:14 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-18 16:37:28 +02:00
gschwab 6ff46bb068 docu fixed 2014-06-18 11:12:10 +02:00
Michael Hackstein 25293a4d20 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 10:51:06 +02:00
gschwab 6dc18982aa graph._removeVertexCollection(...): dropCollection default set to false 2014-06-18 10:50:07 +02:00
gschwab 7366e8a6d9 renamed removeOrphanCollection(..) -> removeVertexCollection(..) 2014-06-18 09:29:34 +02:00
gschwab 903dce0fbf renamed getOrphanCollections() -> orphanCollections() 2014-06-18 09:01:04 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Michael Hackstein 9a948ed92b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-17 13:34:42 +02:00
Alan Plum de9750cf21 Fixed hmac comments. 2014-06-17 13:25:07 +02:00
Michael Hackstein 17b088fcc8 Fixed example generation for new graph module 2014-06-17 13:22:31 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
Jan Steemann 297b4bfac4 added derived files 2014-06-17 00:53:36 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Michael Hackstein e6d6e25a7f Fixed frontend tests, corrected id of svg element to real version. Is now required in code 2014-06-16 23:19:38 +02:00
Michael Hackstein f0d65ce57b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-16 16:29:38 +02:00
Michael Hackstein f8969a5de2 Added more code examples to the graph module 2014-06-16 16:28:48 +02:00
Jan Steemann 02d171412d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-16 14:47:41 +02:00
gschwab 7318417cf8 made make 2014-06-16 14:36:28 +02:00
gschwab 229834f5a4 fixed merge conflicts 2014-06-16 14:27:47 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Michael Hackstein fdd2b6f791 Moved newest version of general graph into web interface 2014-06-16 09:09:05 +02:00
Michael Hackstein b8e96d54ba Started adding examples to the http graph module 2014-06-15 22:42:51 +02:00
Jan Steemann 3301813f3c added missing client-side function 2014-06-13 21:39:35 +02:00
Jan Steemann 5a53dc9f44 fixed typos 2014-06-13 20:08:02 +02:00
Michael Hackstein b986d7baf6 Fixes #894 in Safari + Chrome. Firefox is broken due to a bug in our jQuery version (offset is returning a random value...). IE to be tested. 2014-06-13 17:32:28 +02:00
Michael Hackstein fdece972d0 Added tests for vertex and edge collection lists in http interface. Added docu for _list in general-graph module 2014-06-13 16:41:48 +02:00
Michael Hackstein 7541149200 Added functions to list all graphs and all vertex/edge collections of a specific graph to http-api 2014-06-13 15:11:59 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
Michael Hackstein 8e9ffb5950 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx.js
	js/server/modules/org/arangodb/foxx/request_context.js
 2014-06-13 13:23:56 +02:00
Jan Steemann 1eb39674ef added is.js to frontend 2014-06-13 10:22:18 +02:00
Michael Hackstein ba3a3914fa Included change of existing edge definition in graph-http-module 2014-06-13 09:49:33 +02:00
Michael Hackstein 7e8f63add2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-13 09:33:21 +02:00
Michael Hackstein 66bb4e2047 Corrected API documentation of old graph-api and regenerated api-docs for frontend 2014-06-13 09:33:14 +02:00
Jan Steemann 8843761c0e fixed issue #900 2014-06-12 17:15:35 +02:00
Michael Hackstein e9f161c061 Added a route to add an additional edge definition to the graph 2014-06-12 15:32:50 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
Michael Hackstein 55e5e079f5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-12 14:44:14 +02:00
Michael Hackstein 2198a03b49 Implemented edge crud in http-graph-module. TODO: Modify definitions 2014-06-12 14:43:21 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
Michael Hackstein f89311460f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-12 13:15:44 +02:00
Michael Hackstein 3a0fddb901 Moved the unspecific route to the end of graph-http foxx, was matched too often 2014-06-12 13:15:25 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
Michael Hackstein 25e97eafee Further implemented graph-http-module. Now offers complete vertex interaction. Tests for Vertex Interaction and Edge Interaction added 2014-06-12 08:09:37 +01:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00