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

14142 Commits

Author SHA1 Message Date
Michael Hackstein 1db8391e42 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 16:02:00 +02:00
Michael Hackstein c0cbe73476 Futher layout optimization of FluentAQL Graph Module 2014-06-20 16:01:25 +02:00
Frank Celler 248b3e3329 fixed typo 2014-06-20 15:59:59 +02:00
Jan Steemann 99a67861e6 fixed VS warnings 2014-06-20 15:51:53 +02:00
gschwab eefd78ae0a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:49:23 +02:00
Jan Steemann 7e52ebbc3b fixes for Visual Studio 2014-06-20 15:46:33 +02:00
Thomas Schmidts 3f558b2a85 Fixed correct look for lists in gitbook 2014-06-20 15:42:53 +02:00
gschwab ced319c9ca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:37:45 +02:00
Frank Celler b9fd33c473 LLVM does not know __thread 2014-06-20 15:37:12 +02:00
gschwab 5eda67d643 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:36:33 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
Lucas Dohmen 30e82a8cbb Removed deprecated `/_api/collection/<identifier>/parameter` 2014-06-20 15:35:00 +02:00
gschwab d130d9c647 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:15:28 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
Thomas Schmidts 90ad06833f Change some comments in the code 2014-06-20 15:10:16 +02:00
Michael Hackstein 707c79d5a5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 15:07:29 +02:00
Frank Celler 5ac431a453 generated files 2014-06-20 15:06:18 +02:00
Frank Celler afc211ac5f added --with-bison 2014-06-20 15:06:17 +02:00
Heiko Kernbach 5ef874f8f3 merge 2014-06-20 14:58:30 +02:00
Michael Hackstein 0eff0753e8 Started improving the layout of FluentAQL Documentation in general graph module 2014-06-20 14:57:04 +02:00
Heiko Kernbach ff6877fdc9 added functionality to identify and inform about github information of a foxx 2014-06-20 14:55:22 +02:00
Heiko Kernbach ac9be731aa added new foxx route for git information about foxx app 2014-06-20 14:54:21 +02:00
Frank Celler 44b1421f82 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-20 14:48:26 +02:00
Frank Celler 5db02fe468 moved style to non-less style.css 2014-06-20 14:48:08 +02:00
Jan Steemann be0b4b8c6e remove definePeriodic 2014-06-20 14:45:14 +02:00
Jan Steemann 683510cd14 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:42:41 +02:00
Jan Steemann ee50e680b8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:42:29 +02:00
Jan Steemann 70d589eaa8 fixed compile error 2014-06-20 14:42:17 +02:00
scottashton 9c38f0a1af Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:41:55 +02:00
scottashton 7c532982d0 stabilized tests 2014-06-20 14:41:44 +02:00
Frank Celler af109c73ca Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-20 14:41:13 +02:00
Lucas Dohmen b8e0d95b69 Removed `apps` as an alias for `controllers` in Foxx manifest files 2014-06-20 14:39:48 +02:00
Frank Celler f43eecab1c ignore generated files 2014-06-20 14:39:28 +02:00
Jan Steemann b9c688d117 removed doxygen comments 2014-06-20 14:39:05 +02:00
Jan Steemann 430abbfead Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:37:39 +02:00
Jan Steemann 65eac66ca3 silence compiler 2014-06-20 14:36:27 +02:00
Lucas Dohmen a091aadd6c General deprecation information, deprecate Foxx's controller.collection 2014-06-20 14:35:01 +02:00
Jan Steemann 7c025a33c1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:31:48 +02:00
Jan Steemann 09a64c1f7f fixed compile warnings 2014-06-20 14:30:36 +02:00
Frank Celler 026e600c12 do not print undefined 2014-06-20 14:28:49 +02:00
Frank Celler e5c0418a35 fixed issue #707: Missing exception on mounting foxx app without collection 2014-06-20 14:28:23 +02:00
Frank Celler 2cd0e6d77e Merge pull request #913 from triAGENS/foxx-authentication-options 
Foxx Authentication accepts all options that we support
 2014-06-20 14:27:21 +02:00
scottashton 45b46fb45b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 14:07:56 +02:00
scottashton fda940cd1b fixed tests 2014-06-20 14:07:40 +02:00
Jan Steemann 7b6af73f85 added check for number of logfiles 2014-06-20 13:52:05 +02:00
Jan Steemann 9b713fccba renamed macro 2014-06-20 13:43:29 +02:00
Jan Steemann e51dcdb2cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/tests/shell-general-graph.js
 2014-06-20 13:39:51 +02:00
Jan Steemann 3353066f65 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 13:38:10 +02:00
Jan Steemann a56a0e457c fixed edge index hashing error 2014-06-20 13:37:52 +02:00