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

14618 Commits

Author SHA1 Message Date
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 11f7af36b7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-01 14:18:18 +02:00
Thomas Schmidts 0577583aa5 Changes in the documentation code for API 2014-07-01 14:18:12 +02:00
Jan Steemann 34e727b5f7 simplified 2014-07-01 14:12:25 +02:00
Jan Steemann 1f75c1266b dont crash on applier shutdown 2014-07-01 14:12:07 +02:00
Max Neunhoeffer 5d39caa6a7 Provide increaseNumbers in TransactionBase. 2014-07-01 14:02:10 +02:00
Max Neunhoeffer 604ee2d390 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-07-01 13:54:33 +02:00
Max Neunhoeffer c0fd6bac8d Fix the fix of the arangodump bug in cluster. 2014-07-01 13:54:15 +02:00
Jan Steemann 99657df780 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 13:23:40 +02:00
Jan Steemann 471bf8d65d fix compile warning 2014-07-01 13:23:31 +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 0e5679693c fixed compile warnings 2014-07-01 13:17:46 +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
Max Neunhoeffer bbffe71cfd Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-07-01 10:50:06 +02:00
Max Neunhoeffer 90d5b0cd4a Fix a bug in arangodump for sharded edge collections. 
Collection name in _from and _to fields was not reported correctly.
 2014-07-01 10:48:58 +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 d1abb67511 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 09:12:16 +02:00
scottashton 422c102e34 tests for graph model 2014-07-01 09:12:10 +02:00
Max Neunhoeffer 99936e3624 Fix compilation in non-maintainer-mode. 2014-07-01 08:47:56 +02:00
Frank Celler 7acc123fdc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 22:34:40 +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
Michael Hackstein 1f63a6317d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 17:45:49 +02:00
Michael Hackstein 9db88eb9e7 Fixed a bug in GraphOperations layouting 2014-06-30 17:45:45 +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
Frank Celler b858759350 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 16:59: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 1273a5628b Added documentation for query params on gharial 2014-06-30 16:51:49 +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