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

5993 Commits

Author SHA1 Message Date
Jan Steemann 40ebe10d0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-06 13:53:53 +02:00
Jan Steemann 08654635f1 fixed examples 2014-07-06 13:53:45 +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 158cdd1c7a improved printing of cursors 2014-07-06 00:44:37 +02:00
Jan Steemann 0ab5732c4d updated documentation 2014-07-06 00:21:55 +02:00
Jan Steemann ca97aa4a07 added tests, fixed segfault 2014-07-05 22:58:36 +02:00
Jan Steemann 5d5b3d7009 added AQL documentation 2014-07-05 19:10:56 +02:00
Jan Steemann 64916fd9d8 next attempt 2014-07-05 16:25:35 +02:00
Jan Steemann a7b590e63a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-05 16:19:28 +02:00
Jan Steemann dce300224c attempt to fix test 2014-07-05 16:19:10 +02:00
Alan Plum eea92e17b1 Merge pull request #930 from triAGENS/foxx-repo-indexes 
Fixes #899.
 2014-07-05 16:08:25 +02:00
Alan Plum eaf855d964 Documentation method syntax. 2014-07-05 16:05:55 +02:00
Jan Steemann aba9fd431f web interface didn't update the view after filtering documents 2014-07-05 14:43:30 +02:00
Alan Plum 61909ccd23 Added tests for Repository index magic. Fixes #899. 2014-07-04 17:09:50 +02:00
Alan Plum 40448d69cc Consistency in docs. 2014-07-04 17:08:34 +02:00
Alan Plum 2f1ef93574 Allow using Repository::all without arguments. 2014-07-04 17:08:34 +02:00
Alan Plum f1d0124a0f Added index-specific repository methods. 2014-07-04 17:08:34 +02:00
Jan Steemann 772f5fc876 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-04 13:52:45 +02:00
Jan Steemann 6f4ab77d9b fixed WAL collector moving markers 2014-07-04 13:52:31 +02:00
Alan Plum b5442e1ec8 Whitelist metadata in Model::set. 2014-07-04 11:15:56 +02:00
Alan Plum 391810aa61 Don't throw in Model::get. 2014-07-04 11:15:56 +02:00
Jan Steemann 96b195a34d added test 2014-07-04 08:06:02 +02:00
Jan Steemann 04ed18be47 recovery 2014-07-03 22:50:22 +02:00
Jan Steemann 27c106e1f2 removed debug output 2014-07-03 18:51:50 +02:00
Jan Steemann 470839ffb9 fixed tests 2014-07-03 18:51:40 +02:00
Jan Steemann cbf7e27f68 added derived files 2014-07-03 17:12:56 +02:00
Jan Steemann 6fc0c051d0 added test case 2014-07-03 17:12:25 +02:00
Jan Steemann 7554ead5d4 fixed recovery 2014-07-03 16:58:10 +02:00
Jan Steemann 2babd2a1d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-03 12:58:18 +02:00
Jan Steemann d5e4f6762c foxx-directories test 2014-07-03 12:58:02 +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
Lucas Dohmen f9360c2577 Merge pull request #927 from triAGENS/foxx-model-set-validation 
FoxxModel.set validation
 2014-07-03 07:49:33 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Alan Plum 299cfd80fe Replaced ES5 methods with underscore because reasons. 2014-07-02 17:14:03 +02:00
Alan Plum e3baa87072 Coding style. 2014-07-02 17:14:03 +02:00
Alan Plum e1aa528295 Added tests for bad model attribute setting. 2014-07-02 17:14:02 +02:00
Alan Plum 7b56ff643f Linting. 2014-07-02 17:14:02 +02:00
Alan Plum 19edeb18ba Implemented simple validation in FoxxModel.set 2014-07-02 17:14:02 +02:00
Jan Steemann 8a36d58524 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 16:53:30 +02:00
Jan Steemann d4858f90d3 added test for renaming 2014-07-02 16:53:23 +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 de1c3836aa Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-02 14:16:41 +02:00
Michael Hackstein 75059ac757 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-02 14:16:28 +02:00
Thomas Schmidts e46d87f23c Changed documentation code in configure chapter 2014-07-02 14:08:41 +02:00
Michael Hackstein 0ad3a34266 Added a simple get graph function to gharial. 2014-07-02 14:07:12 +02:00
Jan Steemann a46ac4a8a2 removed mruby 2014-07-02 13:32:07 +02:00
Max Neunhoeffer da4ca4a6b5 Fix bug in disabling of tests. 2014-07-02 11:37:56 +02:00
Max Neunhoeffer ad767b5aee Implement disabling of client tests. 2014-07-02 11:32:38 +02:00
Michael Hackstein 12cf9e4740 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-02 10:30:01 +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 2f1587785b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 10:28:58 +02:00
Jan Steemann 28965618d1 handle renaming of collections 2014-07-02 10:28:43 +02:00
Max Neunhoeffer 439d44cbc7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-07-02 10:26:54 +02:00
Max Neunhoeffer 878678e899 Disable changeMode client test in JS unittest framework. 2014-07-02 10:26:28 +02:00
Max Neunhoeffer e9e2913696 Catch exception in changeMode test. 2014-07-02 10:25:54 +02:00
Jan Steemann 84ef51aaf4 handle properties marker 2014-07-02 09:54:28 +02:00
Jan Steemann ab70cfb9bb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 09:31:17 +02:00
Jan Steemann 7fa01da9b4 handle empty logfiles on startup 2014-07-02 09:31:00 +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
Jan Steemann 0d6ecea63f removed debug output 2014-07-01 15:58:51 +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
Thomas Schmidts 0577583aa5 Changes in the documentation code for API 2014-07-01 14:18:12 +02:00
Max Neunhoeffer 140072a8f0 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-07-01 13:21:06 +02:00
Max Neunhoeffer 7fb712c681 Fix create collection in cluster really. 2014-07-01 13:20:45 +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
Max Neunhoeffer 89654b68cd Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-07-01 11:47:25 +02:00
Max Neunhoeffer 351da7709d Fix bug in creation of sharded collections in cluster. 2014-07-01 11:47:09 +02:00
Jan Steemann 9f51f9a5dd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 11:36:26 +02:00
Jan Steemann 9469513170 remove replication collection 2014-07-01 11:36:13 +02:00
Jan Steemann c28b672fe5 fixed test 2014-07-01 11:35:57 +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
Jan Steemann 41008dab3a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 19:00:42 +02:00
Jan Steemann d55626c038 xxx 2014-06-30 19:00:36 +02:00
Alan Plum 5b62aae51e Disambiguated "lifetime" in Foxx auth. 2014-06-30 17:55:18 +02:00
Alan Plum edf850ce87 Formatting, whitespace. 2014-06-30 17:43:59 +02:00
Thomas Schmidts 9e2a538096 Changed API documentation in code 2014-06-30 17:29:15 +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
Max Neunhoeffer 4a37680d92 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-06-30 16:49:08 +02:00
Max Neunhoeffer 412abdea0b Implement arangodump/restore test in unittests for cluster. 
Not yet working completely.
 2014-06-30 16:48:33 +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
Thomas Schmidts 6ec139f377 Even more changes in the API documentation code 2014-06-30 15:58:11 +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
Michael Hackstein 4cb1cdd977 Added upgrade script for Foxx API endpoints 2014-06-30 15:27:26 +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
gschwab 76d6188a34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 14:37:39 +02:00
Thomas Schmidts d9b733b997 Fixes some documentation pages for API. fixes #922 2014-06-30 14:22:17 +02:00
Thomas Schmidts 6a12940da0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 14:07:29 +02:00
Jan Steemann 9d0f781289 jslint 2014-06-30 13:56:03 +02:00
Jan Steemann 82f2e3d679 added derived file 2014-06-30 13:54:43 +02:00
Jan Steemann d3f8f1b8e0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:52:19 +02:00
gschwab 1c502bfdf8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:39:09 +02:00
gschwab 9bd7d0bb87 fixed orphan prob 2014-06-30 13:39:02 +02:00
Jan Steemann 6d5da6d834 fixed test 2014-06-30 13:28:26 +02:00
Max Neunhoeffer 5fa0b5f54d Recognise Jasmin tests for shell_server tests in JS framework. 2014-06-30 13:16:05 +02:00
Jan Steemann d6a93a5535 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:07:56 +02:00
Jan Steemann bda2db16da recovery and replication 2014-06-30 13:07:48 +02:00
Max Neunhoeffer c8d8706f0c Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-06-30 12:45:33 +02:00
Max Neunhoeffer 48762f3cc2 Add disabled tests. 
Disable shell-readonly test on server.
 2014-06-30 12:45:10 +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
Thomas Schmidts 3d005f6385 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 11:47:57 +02:00
Thomas Schmidts 7d0ab74085 Fixes make examples error 2014-06-30 11:47: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 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