1
0
Fork 0
Commit Graph

13766 Commits

Author SHA1 Message Date
Esteban Lombeyda 9af2994eb9 read-only: unit-tests 2014-06-16 10:47:48 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +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
Jan Steemann 80a70667c0 made headers a real class 2014-06-13 11:31:40 +02:00
Jan Steemann 9e03189fb0 added waitUnload as a test helper function 2014-06-13 11:31:14 +02:00
Thomas Schmidts e49dd38160 Fixed small spelling errors 2014-06-13 11:04:51 +02:00
Lucas Dohmen 08efa7025d Merge branch 'devel' of github.com:triagens/arangodb into devel 2014-06-13 11:01:38 +02:00
Lucas Dohmen 120ecaa000 JSLint 2014-06-13 11:00:57 +02:00
Jan Steemann 1eb39674ef added is.js to frontend 2014-06-13 10:22:18 +02:00
Michael Hackstein 7e8f63add2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-13 09:33:21 +02:00
Michael Hackstein 66bb4e2047 Corrected API documentation of old graph-api and regenerated api-docs for frontend 2014-06-13 09:33:14 +02:00
Thomas Schmidts 533b841175 Some changes in the the theme for gitbook 2014-06-13 09:20:36 +02:00
Jan Steemann 9e19e0c6ca don't print errors if something goes wrong 2014-06-13 02:23:13 +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
Jan Steemann bbdbbd5736 removed implicit parameter from function signature 2014-06-13 01:59:19 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +02:00
Jan Steemann 41dc6a808e fixed recovery 2014-06-13 00:20:24 +02:00
Jan Steemann 2fc5647892 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 18:13:57 +02:00
Jan Steemann bc52f3408f recovery, not functional yet 2014-06-12 18:13:48 +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
Max Neunhoeffer 53cebee93b Remove an unused "using namespace triagens;". 2014-06-12 16:28:07 +02:00
Max Neunhoeffer 369ea69d28 Take care of primitive shapes in LegendReader. 2014-06-12 16:04:32 +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
Max Neunhoeffer 131da49f60 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 15:42:06 +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
Michael Hackstein e9f161c061 Added a route to add an additional edge definition to the graph 2014-06-12 15:32:50 +02:00
Max Neunhoeffer 982ca7460b Implement StringifyMarkerDump for WAL markers.
This implements a LegendReader class inheriting from TRI_shaper_t,
to allow for TRI_StringifyArrayShapedJson to work.
2014-06-12 15:30:18 +02:00
gschwab abd8000009 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 15:29:55 +02:00
Lucas Dohmen d0ebec7276 Merge pull request #892 from triAGENS/foxx-body-params
Foxx – Extend Body Params
2014-06-12 15:28:52 +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