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 |
Jan Steemann
|
3995b9b4d3
|
write-throttling fix
|
2014-06-30 13:52:12 +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
|
a2e7477751
|
Create setNumbers method for TransactionBase class.
|
2014-06-30 11:07:56 +02:00 |
Max Neunhoeffer
|
c36995c8b8
|
Fix gharial test if not mounted under /system.
|
2014-06-30 11:00:31 +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 |