1
0
Fork 0
Commit Graph

1580 Commits

Author SHA1 Message Date
Jan Steemann 713b69f1f5 fixed tests 2014-06-13 20:18:55 +02:00
Jan Steemann 5a53dc9f44 fixed typos 2014-06-13 20:08:02 +02:00
Jan Steemann 34389a10d3 added AQL TRANSLATE function 2014-06-13 19:53:58 +02:00
Jan Steemann 85b92dbf21 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 18:16:48 +02:00
Jan Steemann 96385080bc fixed test 2014-06-13 18:16:42 +02:00
Jan Steemann 0c5950507c fixed test 2014-06-13 17:50:44 +02:00
Michael Hackstein fdece972d0 Added tests for vertex and edge collection lists in http interface. Added docu for _list in general-graph module 2014-06-13 16:41:48 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
Jan Steemann d592591a06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-13 11:31:59 +02:00
Lucas Dohmen 120ecaa000 JSLint 2014-06-13 11:00:57 +02:00
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
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
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 1aa671ed8c fixed string constraints 2014-06-12 13:42:46 +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
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
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 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 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
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 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