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

6011 Commits

Author SHA1 Message Date
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 075b96299a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 11:09:14 +02:00
Michael Hackstein 874343697e Fixed resizing tests 2014-06-30 11:09:07 +02:00
Max Neunhoeffer c6f9c748ee Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-06-30 10:55:38 +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
Max Neunhoeffer 16168e642a Fix test of NoCreate-Mode. 2014-06-30 09:55:16 +02:00
gschwab 33a208796d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 09:50:10 +02:00
gschwab fc66c71c19 test changed 2014-06-30 09:50:04 +02:00
Thomas Schmidts 52ad8fc702 Some changes in the documentation code for gitbook 2014-06-30 09:29:02 +02:00
Thomas Schmidts c263b2a5e1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-29 03:34:42 +02:00
Thomas Schmidts c2cb0d5a10 Some changes to the comments in the code 2014-06-29 03:34:22 +02:00
Jan Steemann 56a9361f9f fill secondary indexes after recovery only 2014-06-29 00:18:21 +02:00
Frank Celler 678d126f43 cleanup of modules 2014-06-28 14:03:58 +02:00
Jan Steemann 21ea9b4d4b recovery tests 2014-06-28 01:58:06 +02:00
Jan Steemann 187a006db7 jslint 2014-06-27 19:26:18 +02:00
Jan Steemann e7aef1e468 be less chatty on upgrade / initialisation 2014-06-27 19:25:06 +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 e6225b66c6 adjusted tests for new rewrite rules on apache 2014-06-27 17:02:02 +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 8a6d387c59 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-27 14:49:50 +02:00
gschwab 6f36046fc8 edit graph 2014-06-27 14:49:45 +02:00
Thomas Schmidts 22f7b8390b Changed documentation in code for Foxx 2014-06-27 14:30:39 +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
Thomas Schmidts dd9e29702c changed design of functions in documentation 2014-06-26 17:25:43 +02:00
Jan Steemann 87e1bac74f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 17:17:00 +02:00
Jan Steemann bb2818a210 added oversize marker tests 2014-06-26 17:16:36 +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 68309a2d83 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:40:03 +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
Esteban Lombeyda 5206610e18 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 16:39:09 +02:00
Esteban Lombeyda 5d162c0b3c moving some nonccluster tests to a new file 2014-06-26 16:38:08 +02:00
Jan Steemann 71f8b58e1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 16:27:02 +02:00
Jan Steemann cea36cf8b4 less randomness 2014-06-26 16:26:50 +02:00
Jan Steemann a8e1aabd40 renamed test file 2014-06-26 16:19:22 +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
Jan Steemann 0ed55b132b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 16:02:15 +02:00
Jan Steemann c8978771c0 exclude test in cluster mode 2014-06-26 16:02:08 +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 926c301cd2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 15:51:22 +02:00
scottashton 357be2cbbe adjusted tests for new graph management 2014-06-26 15:51:11 +02:00
Esteban Lombeyda 4569420fda all file for tesing the changeMode werde renamed 2014-06-26 15:42:17 +02:00
scottashton de7fe5f2ba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 15:10:29 +02:00
scottashton d610cf9107 finally managed to disable the enter button in create graph modal 2014-06-26 15:10:23 +02:00
Esteban Lombeyda 0c2376dead Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 14:58:36 +02:00
Esteban Lombeyda ef111c0f6e changeMode test is execute only in noncluster environoments 2014-06-26 14:57:01 +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
Thomas Schmidts 3eae1a4751 Exchanged verbinclude with Arangosh for bett examples in gitbook 2014-06-26 13:41:17 +02:00
Jan Steemann eec6012318 increased wait time 2014-06-26 13:18:30 +02:00
Jan Steemann 96569367d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/document-collection.cpp
 2014-06-26 13:07:53 +02:00
Jan Steemann 1bb171787f clean up when journal creation fails 2014-06-26 13:03:45 +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
Jan Steemann 9f37a21729 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 12:37:11 +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
Jan Steemann 183469227c fixed rollback of updates 2014-06-26 11:38:41 +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 bbfe3c508d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-25 17:45:03 +02:00
scottashton 66860ac120 deactivated some tests 2014-06-25 17:44:59 +02:00
Thomas Schmidts d01417c6ed changed simple-query-common.js to read out the comments for the dcoumentation 2014-06-25 17:39:46 +02:00
scottashton 70a2d681c4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-25 17:30:41 +02:00
scottashton 3a9b88c1a7 accidentaly removed content from modalView.js 2014-06-25 17:30:25 +02:00
Thomas Schmidts 45f27782e0 More changes in the documentation code 2014-06-25 17:27:12 +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
Thomas Schmidts a43e8e065d Some changes in the documentation code 2014-06-25 16:29:17 +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 88e4f0a8f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-25 14:47:11 +02:00
gschwab 71621b9d4e fixed tests 2014-06-25 14:47:03 +02:00
Frank Celler 291c92dbf3 renamed ReadOnly to NoCreate 2014-06-25 14:32:00 +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 58c75a582a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-25 09:14:55 +02:00
gschwab 466d13ddd2 new graph management 2014-06-25 09:14:45 +02:00
Lucas Dohmen 9b37812da6 Review of General Graph 2014-06-24 23:44:49 +08: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 f3e9aee70c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:27:50 +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
Thomas Schmidts 34e1addcfb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:23:54 +02:00
Jan Steemann 1ac957a5ac fixed indentation, copy&paste, incomplete and too complicated tests 2014-06-24 17:20:14 +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
Thomas Schmidts f4c6c97488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 16:09:27 +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
Esteban Lombeyda fab2e0b855 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 15:23:18 +02:00
Esteban Lombeyda fff305170e renaming test in order to run in only in non cluster environments 2014-06-24 15:22:24 +02:00
Jan Steemann a289c9aa78 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 15:11:30 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
Thomas Schmidts 0bf957ddd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 14:28:50 +02:00
Thomas Schmidts 0d969e6814 Changes in the gitbook, also bug fixing in code 2014-06-24 14:28:30 +02:00
scottashton 3dc7188141 heal the build 2014-06-24 14:26:46 +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
scottashton 3ba8719173 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 13:13:09 +02:00
scottashton 4f01409c4b processed lucas feedback regarding aql docu 2014-06-24 13:13:01 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
Jan Steemann 42643c6b50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 12:07:04 +02:00
Jan Steemann 303378d8e2 honor `--server.disable-statistics` 2014-06-24 12:06:47 +02:00
gschwab 5f5d6171cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 11:54:48 +02:00
gschwab e049f85b44 docu 2014-06-24 11:54:42 +02:00
Jan Steemann c17d550097 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 11:26:55 +02:00
Jan Steemann 97e36a7eb0 fixed examples 2014-06-24 11:26:51 +02:00
Jan Steemann 31e6823daa fixed invalid regex 2014-06-24 11:24:10 +02:00
Esteban Lombeyda 357183ce3e Bug fix in setUp function 2014-06-24 10:58:51 +02:00
Jan Steemann 98f87b1f80 write-throttling 2014-06-24 10:55:05 +02:00
gschwab f9f73c4e51 docu 2014-06-24 10:44:06 +02:00
gschwab 62dd01fe00 docu 2014-06-24 10:41:23 +02:00
gschwab eb887369e7 merge after make 2014-06-24 09:52:23 +02:00
Jan Steemann 9695b25673 added tests 2014-06-24 09:19:26 +02:00
Lucas Dohmen 9bf547374d JSLint 😊 2014-06-24 13:47:41 +08:00
Lucas Dohmen 04ddc2ba3c Review of GraphOperations 2014-06-24 13:29:14 +08:00
Lucas Dohmen d625e38acf Foxx Model: Also update whitelisted attributes 2014-06-24 13:29:14 +08:00
Jan Steemann 8d8dfe5cd0 added derived files 2014-06-24 00:44:25 +02:00
Jan Steemann 5ce280b5f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 00:38:33 +02:00
Jan Steemann d56719ae4d simplification of signatures 2014-06-24 00:32:40 +02:00
Thomas Schmidts 8d4527a8c9 Changed Documentation in code 2014-06-24 00:01:27 +02:00
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Jan Steemann f72ccde9cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 17:46:25 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +02:00
Thomas Schmidts dac7bef3fc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 16:19:09 +02:00
Thomas Schmidts 859ad4fbb0 Changes in the code documentation 2014-06-23 16:18:58 +02:00
Michael Hackstein 7e3d0be402 Beautified examples of gharial 2014-06-23 15:53:31 +02:00
Michael Hackstein cff6bd9380 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-06-23 15:15:18 +02:00
Michael Hackstein 57a77b4420 Changed all examples so they use graph_module and graph as variable names 2014-06-23 15:14:39 +02:00
gschwab e799d7d04a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 15:14:21 +02:00
gschwab 56d8db54aa docu 2014-06-23 15:14:16 +02:00
scottashton 4e717d5430 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 15:11:54 +02:00
scottashton e2fc348467 fixed broken links and typos in general-graph 2014-06-23 15:11:36 +02:00
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
gschwab 70ebd88298 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 14:52:05 +02:00
gschwab b69b016f87 layout 2014-06-23 14:44:07 +02:00
Lucas Dohmen c67b1d9d5a Foxx: Fix Model.fromClient 2014-06-23 14:43:58 +02:00
Lucas Dohmen f62ce6cd7f Foxx: Fix error for `body()` when body is empty 2014-06-23 14:16:13 +02:00
Frank Celler 34908e450b hidden for http examples 2014-06-23 14:04:16 +02:00
Lucas Dohmen 8831f91f9d Foxx Model: Allow to access the whitelisted attributes from ancestor 2014-06-23 13:52:29 +02:00
gschwab 898311c23b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:44:24 +02:00
gschwab 0b09442ad9 typos 2014-06-23 13:44:04 +02:00
scottashton 7efc5b77cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:35:01 +02:00
scottashton 371bfabf67 spellchecked gitbook for general-graph and ahuacatl 2014-06-23 13:34:44 +02:00
gschwab a954b7a781 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:34:18 +02:00
Jan Steemann 6707468c95 excluded collection 2014-06-23 13:27:27 +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 7e3bebead7 Sorted export ordering of graph functions in ahuacatl. First deprecated modules are exported, afterwards general graph functions 2014-06-23 13:18:00 +02:00
Michael Hackstein 273eaf95fb Added graph specific deprecation information to DEPRECATED.md 2014-06-23 13:17:20 +02:00
gschwab 8b347c6714 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:02:00 +02:00
gschwab cda1eb462c sorting for edgeDefinitions added 2014-06-23 13:01:55 +02:00
scottashton b35b19a231 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 11:37:57 +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
Michael Hackstein d0213dc516 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 11:01:07 +02:00
Michael Hackstein b37881c4de Fixed minor mistakes in general graph module documentation 2014-06-23 11:01:04 +02:00
Frank Celler c21c1d9a46 added underscore 2014-06-23 10:44:16 +02:00
gschwab 542a4263e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 10:16:10 +02:00
gschwab 5406db3dc8 renamed _getToVertex(...) -> _toVertex(..) 2014-06-23 10:16:05 +02:00
Thomas Schmidts c11417cbdb Fixed some some issues with the appearance of the Foxx Chapter 2014-06-23 09:56:08 +02:00
Michael Hackstein 7bf98a463b Documentation fixes in general graph module. Fixed Example to drop a graph (drops collections in background now) 2014-06-23 09:50:19 +02:00
gschwab 69df68c54e renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:47:48 +02:00
gschwab d31e8f784b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-06-23 09:13:51 +02:00
gschwab 1f02d36570 renamed _getFromVertex(...) -> _fromVertex(..) 2014-06-23 09:11:07 +02:00
Jan Steemann 82a220361c issue #919: fixed null options handling 2014-06-23 08:40:51 +02:00
scottashton 62fd91ce3d changed return value of common properties so only the matching attributes are returned 2014-06-23 07:27:20 +02:00
Jan Steemann b5fe73270c use test-helper for unloading collections 2014-06-21 03:19:54 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Jan Steemann c1b24339ae fixed examples for rotate 2014-06-20 23:39:32 +02:00
Michael Hackstein b468d336c8 Fixed an error for list of graphs in the graph module 2014-06-20 17:45:37 +02:00
Michael Hackstein 76049a456a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 17:25:14 +02:00
Michael Hackstein 59010f7a68 Finished with the first run through the general graph modules documentation to add improvements 2014-06-20 17:25:05 +02:00
Heiko Kernbach 07f01f90d3 jslint 2014-06-20 17:21:54 +02:00
Heiko Kernbach 6770ddd9c9 merge 2014-06-20 17:04:00 +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
scottashton 1cef1a0cd7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:59:58 +02:00
scottashton fb7c608f6c refactored ahuacatl docs 2014-06-20 16:59:51 +02:00
Michael Hackstein 7bff2d7ff7 And some more optimizations of the general graph module documentation 2014-06-20 16:57:33 +02:00
Lucas Dohmen 192a35eeca testrunner jslinted 2014-06-20 16:40:34 +02:00
Lucas Dohmen b88be851e8 JSLinted org/arangodb/extend 2014-06-20 16:40:34 +02:00
Lucas Dohmen f6b7bb23a0 Remove the stub and mock module 
This is now inside of shell-foxx until it has been converted to
Jasmine
 2014-06-20 16:40:34 +02:00
Lucas Dohmen ca6a9c02ca `backbone` is now `org/arangodb/extend` 2014-06-20 16:40:34 +02:00
Lucas Dohmen ec43e21fb7 Move `util` to node, because it is only used there 2014-06-20 16:40:33 +02:00
Michael Hackstein 426961abef Further improvements of general-graph documentation. 2014-06-20 16:21:17 +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
Lucas Dohmen 95fb92b195 Move testrunner into the org/arangodb 'namespace' 2014-06-20 16:05:09 +02:00
Michael Hackstein 1db8391e42 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 16:02:00 +02:00
Michael Hackstein c0cbe73476 Futher layout optimization of FluentAQL Graph Module 2014-06-20 16:01:25 +02:00
Frank Celler 248b3e3329 fixed typo 2014-06-20 15:59:59 +02:00
gschwab 5eda67d643 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:36:33 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
Lucas Dohmen 30e82a8cbb Removed deprecated `/_api/collection/<identifier>/parameter` 2014-06-20 15:35:00 +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 ff6877fdc9 added functionality to identify and inform about github information of a foxx 2014-06-20 14:55:22 +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
scottashton 9c38f0a1af Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:41:55 +02:00
scottashton 7c532982d0 stabilized tests 2014-06-20 14:41:44 +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
Lucas Dohmen b8e0d95b69 Removed `apps` as an alias for `controllers` in Foxx manifest files 2014-06-20 14:39:48 +02:00
Jan Steemann b9c688d117 removed doxygen comments 2014-06-20 14:39:05 +02:00
Frank Celler e5c0418a35 fixed issue #707: Missing exception on mounting foxx app without collection 2014-06-20 14:28:23 +02:00
Frank Celler 2cd0e6d77e Merge pull request #913 from triAGENS/foxx-authentication-options 
Foxx Authentication accepts all options that we support
 2014-06-20 14:27:21 +02:00
scottashton 45b46fb45b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:07:56 +02:00
scottashton fda940cd1b fixed tests 2014-06-20 14:07:40 +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
Jan Steemann 3353066f65 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 13:38:10 +02:00
Frank Celler 9c33dec659 verbose comment 2014-06-20 13:34:22 +02:00
Frank Celler 4458393655 added missing description 2014-06-20 13:33:52 +02:00
Michael Hackstein 44297f43c0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 13:02:06 +02:00
Michael Hackstein c7eeee59b1 Fixed return codes of traversal api 2014-06-20 13:02:02 +02:00
scottashton ec2d0e94f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 13:00:01 +02:00
scottashton ec45a40d0b changed examples in routplanner 2014-06-20 12:59:56 +02:00
Heiko Kernbach 39cf260ff2 better usability for foxx github installer 2014-06-20 11:40:38 +02:00
Lucas Dohmen 03b4a01037 Foxx Authentication accepts all options that we support 2014-06-20 11:12:56 +02:00
Heiko Kernbach 6191403181 jslint 2014-06-20 10:35:40 +02:00
Esteban Lombeyda 809d951a50 formating 2014-06-20 10:34:14 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +02:00
scottashton 678277981c fixed merge conflict 2014-06-20 09:59:00 +02:00
scottashton b263e38a9e docu refactoring, added more functions into graph module 2014-06-20 09:58:09 +02:00
Jan Steemann 2e734b6a9a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:53:32 +02:00
Jan Steemann 218d23d761 fixed jslint warning 2014-06-20 09:53:01 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
Michael Hackstein 72b785568b Fixed indention of sublists in api-traversal docu 2014-06-20 09:31:57 +02:00
Michael Hackstein 09f6b6be1f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 09:28:24 +02:00
Michael Hackstein e6519fd292 Started generation of traversal api documentation. Still not successful 2014-06-20 09:20:33 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +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 c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann 86def51c51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 08:22:04 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Lucas Dohmen 049067dbc4 Merge pull request #874 from triAGENS/foxx-doc-generator-improvements 
Foxx API Documentation explorer doesn't show POST/PUT/PATCH bodies without bodyParam
 2014-06-19 11:53:48 +02:00
Lucas Dohmen 96866a0d9f Some tweaks to the Foxx.Repository documentation 2014-06-19 10:28:36 +02:00
Lucas Dohmen e83d05d3b2 Foxx.Repository#count 2014-06-19 10:28:36 +02:00
Lucas Dohmen ca41f74a63 Foxx.Repository#updateById 2014-06-19 10:28:35 +02:00
Lucas Dohmen 473566a4e2 Foxx.Repository#updateByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 94e2d0e9a4 Foxx.Repository#replaceByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 3bfff286d0 Foxx.Repository#remove 2014-06-19 10:28:35 +02:00
Lucas Dohmen 4b769867be Foxx.Repository#all 2014-06-19 10:28:35 +02:00
Lucas Dohmen b9d4a96652 Add simple documentation for methods without bodyParam 
post, put and patch requests without a bodyParam will now be documented
with an undocumented bodyParam. This will allow people to try out this
undocumented field in the Swagger documentation in the admin interface.
 2014-06-19 10:28:16 +02:00
Jan Steemann bded33eec8 fixed typos 2014-06-18 21:48:29 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Jan Steemann e39737f99e no error but a warning 2014-06-18 21:13:25 +02:00
Jan Steemann 44ad4eea48 added tests for AQL write operations 2014-06-18 20:43:08 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +02:00
Frank Celler 5ea6286029 removed leading blanks 2014-06-18 19:14:34 +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 791c3bb67e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 17:01:32 +02:00
Michael Hackstein eb698dfb63 Fixed a merging error in api-traversal 2014-06-18 17:00:11 +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
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
Frank Celler c18b219a1f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-18 16:12:42 +02:00
Frank Celler cef655eb49 ignore devel version 2014-06-18 16:04:48 +02:00
Michael Hackstein e37167674b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/api-traversal.js
 2014-06-18 15:56:55 +02:00
Michael Hackstein 4305c8e67b Examples in traversal module now use new graph module 2014-06-18 15:55:35 +02:00
gschwab 10ff1d391c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-18 15:22:55 +02:00
gschwab cb649c1293 fixed collection binding 2014-06-18 15:22:49 +02:00
Alan Plum ba61e07e02 More linting. 2014-06-18 15:21:29 +02:00