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

5221 Commits

Author SHA1 Message Date
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
 2014-06-13 02:23:03 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 8843761c0e fixed issue #900 2014-06-12 17:15:35 +02:00
gschwab baabd0d7ca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 16:57:35 +02:00
gschwab 1ed179cbaa some docu for orphan collections 2014-06-12 16:57:31 +02:00
Lucas Dohmen 87987b7a14 Merge pull request #897 from pluma/foxx-context-collection-method 
Added `collection` method to Foxx applicationContext
 2014-06-12 16:41:50 +02:00
Lucas Dohmen 4dbaa665ac Merge pull request #895 from pluma/sugary-foxx-exports 
More sugary Foxx exports
 2014-06-12 16:39:57 +02:00
Alan Plum 477cec53aa Cleaned up stray whitespace. 2014-06-12 15:57:39 +02:00
Alan Plum 475daa1ed2 Removed tests for deprecated code. 2014-06-12 15:54:27 +02:00
Alan Plum c935ea6d20 Fixed reference to context. 2014-06-12 15:54:01 +02:00
Lucas Dohmen d12e993289 Merge pull request #896 from pluma/foxx-no-required-controllers 
Allow controller-free Foxx apps
 2014-06-12 15:38:20 +02:00
gschwab abd8000009 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 15:29:55 +02:00
gschwab 1ef948a410 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 15:28:41 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
Alan Plum 251f237184 Renamed Foxx.app -> Foxx.requireApp. 2014-06-12 15:14:09 +02:00
Alan Plum fdea995b6e Deprecated Foxx.Controller#collection. 2014-06-12 15:12:05 +02:00
Alan Plum 41a82d9726 Added friendlier wrapper for manager.mountedApp. 2014-06-12 15:09:02 +02:00
Alan Plum 9857fa571e Allow controller-free apps. 2014-06-12 15:08:46 +02:00
Alan Plum e7f6aecaf5 Added collection method to Foxx applicationContext. 2014-06-12 15:07:18 +02:00
Lucas Dohmen 38bf144496 Foxx: Documentation for extended bodyParam functionality 2014-06-12 15:02:47 +02:00
Lucas Dohmen c0bfeee04e Test multiple element functionality 2014-06-12 15:02:47 +02:00
Lucas Dohmen 89e9205b7c Test multiple items functionality 2014-06-12 15:02:47 +02:00
Lucas Dohmen 6d0d3565fa Foxx: Adjust fakeContext to feature the manifest element 2014-06-12 15:02:47 +02:00
Lucas Dohmen b5529ac37e Introduce optional root element for body params 2014-06-12 15:02:46 +02:00
Lucas Dohmen e24d344016 Add option for the rootElement and make it available via appContext 2014-06-12 15:02:46 +02:00
Lucas Dohmen d4a6250fc2 Foxx: Body Params can optionally take more than one object 2014-06-12 15:02:46 +02:00
Lucas Dohmen cec32b981a Adjust tests to @fceller's bug fix 2014-06-12 14:24:50 +02:00
Frank Celler 6b770c3476 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-12 13:42:52 +02:00
Frank Celler 1aa671ed8c fixed string constraints 2014-06-12 13:42:46 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
gschwab 3900902821 tmp repaired empty block for commit 2014-06-12 11:42:27 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
scottashton e6d68e6070 finished documenation for aql graph 2014-06-12 10:43:20 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
Jan Steemann fa6e98d94c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
 2014-06-11 17:40:15 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
scottashton f4b67ed01d jslinted 2014-06-11 16:04:15 +02:00
Jan Steemann ba389b996c jslint 2014-06-11 16:00:27 +02:00
gschwab 63272b8a47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:51:41 +02:00
gschwab 76ce378991 jslint 2014-06-11 15:51:37 +02:00
gschwab de08c073ab jslint 2014-06-11 15:50:30 +02:00
scottashton 5bb6a22e82 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 15:45:46 +02:00
scottashton 8209796f7c added documentation to ahuacatl general graph functions and refactored common_Neighbors and common_properties 2014-06-11 15:45:31 +02:00
gschwab 3556868659 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-11 14:52:10 +02:00
gschwab 4bc2905f29 added extend and edit functions for edgeDefinitions of existing graphs 2014-06-11 14:51:26 +02:00
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