1
0
Fork 0
Commit Graph

5725 Commits

Author SHA1 Message Date
Jan Steemann d55626c038 xxx 2014-06-30 19:00:36 +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
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
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