1
0
Fork 0
Commit Graph

5175 Commits

Author SHA1 Message Date
Jan Steemann 4cd857f5b9 added generated files 2014-06-11 14:25:01 +02:00
Jan Steemann 49cc332361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	js/common/bootstrap/errors.js
2014-06-11 14:23:47 +02:00
Jan Steemann 28d2ae151e flush 2014-06-11 14:18:04 +02:00
Jan Steemann 7e6750c397 wal flush w/ collection unload 2014-06-11 11:33:02 +02:00
Michael Hackstein f9628e48c2 Fixed tests for new error codes. Also implemented creation of an empty graph initially. It can be modified during runtime 2014-06-11 10:52:07 +02:00
Michael Hackstein aa659e4686 Fixed JSLint warning 2014-06-11 10:23:03 +02:00
Michael Hackstein e2ab756642 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-11 09:59:41 +02:00
Michael Hackstein d2159e8897 Added some error objects for general graph module 2014-06-11 09:59:23 +02:00
Jan Steemann 5a8cdb0ec5 wal flush 2014-06-11 09:32:20 +02:00
Frank Celler 57bb47185b moved try/catch block to the top of routing chain 2014-06-10 22:57:10 +02:00
Heiko Kernbach 768822709e version control for foxx apps 2014-06-10 18:09:42 +02:00
Heiko Kernbach 812b93d9d0 merge 2014-06-10 15:21:47 +02:00
Heiko Kernbach eb08541171 foxx apps install now via github 2014-06-10 15:21:27 +02:00
gschwab 866709a434 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-10 13:30:13 +02:00
gschwab 4bcca3408a - added function to remove a single edge definition from a graph\n- some docu 2014-06-10 13:30:07 +02:00
Frank Celler ca5a3ba908 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-10 13:16:20 +02:00
Frank Celler 4354d3e77c added example-users 2014-06-10 13:16:05 +02:00
scottashton 6649fc5819 fixed test 2014-06-10 13:06:43 +02:00
scottashton d70688c61f stabilized tests 2014-06-10 11:55:43 +02:00
Jan Steemann 191b46c063 fixed undefined variable access 2014-06-10 09:43:15 +02:00
Jan Steemann d9653bc462 DML for AQL 2014-06-10 09:30:27 +02:00
Jan Steemann 3f22fa03be fixed some indexes 2014-06-08 03:03:16 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann c6b8bb7313 do not create _trx collection 2014-06-06 17:06:07 +02:00
Jan Steemann 7b9e3af0f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/VocBase/voc-shaper.cpp
2014-06-06 17:00:49 +02:00
Michael Hackstein af735550fb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 16:32:35 +02:00
Michael Hackstein e13164e247 Fixed duplicated names for examples 2014-06-06 16:32:32 +02:00
gschwab dda28bc102 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-06 15:41:50 +02:00
gschwab ee46c3bdaa fixed jslint 2014-06-06 15:41:46 +02:00
gschwab 682d85a948 renaming of getIn/OutVertex to getFrom/ToVertex, documentation 2014-06-06 15:40:51 +02:00
Michael Hackstein 0fc0d74e6b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 15:40:49 +02:00
Michael Hackstein fdb79e26d1 The foxx manager now throws a more useful error if the fetched file is already on the server 2014-06-06 15:40:19 +02:00
Heiko Kernbach 90c89754fa userManagementViewSpec added 2014-06-06 15:34:31 +02:00
Heiko Kernbach abe2481363 merge 2014-06-06 15:32:26 +02:00
Heiko Kernbach 0f21f69082 userManagementViewSpec added 2014-06-06 15:32:07 +02:00
Frank Celler b395ecc15b changed eol 2014-06-06 15:11:49 +02:00
Michael Hackstein 55efd34aab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 15:00:32 +02:00
Michael Hackstein 920cf4b7c3 Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark 2014-06-06 15:00:26 +02:00
Esteban Lombeyda 86bf6ad529 Bug Fix update-by-example in Coordinator 2014-06-06 14:18:15 +02:00
Esteban Lombeyda b848ff00b5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-06 10:55:11 +02:00
Jan Steemann cb5bb4eb0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	arangod/Makefile.files
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/voc-shaper.cpp
2014-06-05 22:58:49 +02:00
Jan Steemann fd7f288a59 added test case for shape movements 2014-06-05 22:23:02 +02:00
Michael Hackstein 87b4124dfc Updated fluent AQL query interface documentation 2014-06-05 17:36:12 +02:00
scottashton e6b4fff2f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-05 16:59:53 +02:00
scottashton fe621c1723 finished measurements 2014-06-05 16:59:43 +02:00
Esteban Lombeyda 7171c91c03 renaming tests 2014-06-05 16:29:24 +02:00
Michael Hackstein 9e4a983d2f Simplified some general graph tests 2014-06-05 11:45:20 +02:00
Michael Hackstein bcbcf635e4 Further improvements in FluentAQL docu. It is now at least readable 2014-06-04 19:03:19 +02:00
Jan Steemann 3d4873457b unload 2014-06-04 18:21:06 +02:00
Jan Steemann 7b7f42118e fixed some unique constraint violation handling 2014-06-04 17:28:06 +02:00