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

1877 Commits

Author SHA1 Message Date
Thomas Schmidts c2cb0d5a10 Some changes to the comments in the code 2014-06-29 03:34:22 +02:00
Jan Steemann 56a9361f9f fill secondary indexes after recovery only 2014-06-29 00:18:21 +02:00
Jan Steemann 21ea9b4d4b recovery tests 2014-06-28 01:58:06 +02:00
Jan Steemann 187a006db7 jslint 2014-06-27 19:26:18 +02:00
Jan Steemann e7aef1e468 be less chatty on upgrade / initialisation 2014-06-27 19:25:06 +02:00
Thomas Schmidts 22f7b8390b Changed documentation in code for Foxx 2014-06-27 14:30:39 +02:00
Thomas Schmidts 148f400991 Changed some (sub)chapters and fixed spelling errors 2014-06-27 11:02:10 +02:00
Thomas Schmidts dd9e29702c changed design of functions in documentation 2014-06-26 17:25:43 +02:00
Jan Steemann bb2818a210 added oversize marker tests 2014-06-26 17:16:36 +02:00
Jan Steemann cea36cf8b4 less randomness 2014-06-26 16:26:50 +02:00
Jan Steemann c8978771c0 exclude test in cluster mode 2014-06-26 16:02:08 +02:00
Jan Steemann 1bb171787f clean up when journal creation fails 2014-06-26 13:03:45 +02:00
Jan Steemann 9f37a21729 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-26 12:37:11 +02:00
scottashton de0da1e7b7 changed signature of the traversal functions 2014-06-26 11:55:35 +02:00
Jan Steemann 183469227c fixed rollback of updates 2014-06-26 11:38:41 +02:00
Frank Celler 9bfaeeebd0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 17:22:30 +02:00
Frank Celler 87e1e16ad9 execute setup for system apps 2014-06-25 17:22:24 +02:00
Thomas Schmidts a43e8e065d Some changes in the documentation code 2014-06-25 16:29:17 +02:00
Thomas Schmidts cba9529153 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-25 16:15:36 +02:00
scottashton 9d0399ee0e new templates for graph management 2014-06-25 16:08:21 +02:00
scottashton 235a438c0c finished documentation of complexity 2014-06-25 15:51:41 +02:00
Thomas Schmidts f005d676cb Some changes in the code documentation 2014-06-25 15:10:13 +02:00
Thomas Schmidts f7be757b0b Some changes in the code documentation 2014-06-25 14:57:29 +02:00
Frank Celler 291c92dbf3 renamed ReadOnly to NoCreate 2014-06-25 14:32:00 +02:00
Thomas Schmidts 34e1addcfb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 17:23:54 +02:00
Jan Steemann 1ac957a5ac fixed indentation, copy&paste, incomplete and too complicated tests 2014-06-24 17:20:14 +02:00
Jan Steemann cf14609727 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 16:12:07 +02:00
Jan Steemann f411fceb2e exposed WAL API 2014-06-24 16:10:27 +02:00
Thomas Schmidts f4c6c97488 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 16:09:27 +02:00
Esteban Lombeyda fab2e0b855 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 15:23:18 +02:00
Esteban Lombeyda fff305170e renaming test in order to run in only in non cluster environments 2014-06-24 15:22:24 +02:00
Jan Steemann a289c9aa78 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 15:11:30 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
Thomas Schmidts 0bf957ddd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-24 14:28:50 +02:00
Thomas Schmidts 0d969e6814 Changes in the gitbook, also bug fixing in code 2014-06-24 14:28:30 +02:00
scottashton 3dc7188141 heal the build 2014-06-24 14:26:46 +02:00
scottashton 3ba8719173 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 13:13:09 +02:00
scottashton 4f01409c4b processed lucas feedback regarding aql docu 2014-06-24 13:13:01 +02:00
Jan Steemann 303378d8e2 honor `--server.disable-statistics` 2014-06-24 12:06:47 +02:00
Jan Steemann c17d550097 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 11:26:55 +02:00
Esteban Lombeyda 357183ce3e Bug fix in setUp function 2014-06-24 10:58:51 +02:00
Jan Steemann 98f87b1f80 write-throttling 2014-06-24 10:55:05 +02:00
Jan Steemann 9695b25673 added tests 2014-06-24 09:19:26 +02:00
Lucas Dohmen 9bf547374d JSLint 😊 2014-06-24 13:47:41 +08:00
Lucas Dohmen 04ddc2ba3c Review of GraphOperations 2014-06-24 13:29:14 +08:00
Lucas Dohmen d625e38acf Foxx Model: Also update whitelisted attributes 2014-06-24 13:29:14 +08:00
Jan Steemann 5ce280b5f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-24 00:38:33 +02:00
Jan Steemann d56719ae4d simplification of signatures 2014-06-24 00:32:40 +02:00
Thomas Schmidts 8d4527a8c9 Changed Documentation in code 2014-06-24 00:01:27 +02:00
Jan Steemann 53909c0dcd adjusted tests 2014-06-23 18:45:06 +02:00
Thomas Schmidts 859ad4fbb0 Changes in the code documentation 2014-06-23 16:18:58 +02:00
Thomas Schmidts 10a5b782fd Some changes in the documentation code 2014-06-23 14:55:14 +02:00
Lucas Dohmen c67b1d9d5a Foxx: Fix Model.fromClient 2014-06-23 14:43:58 +02:00
Lucas Dohmen f62ce6cd7f Foxx: Fix error for `body()` when body is empty 2014-06-23 14:16:13 +02:00
Lucas Dohmen 8831f91f9d Foxx Model: Allow to access the whitelisted attributes from ancestor 2014-06-23 13:52:29 +02:00
scottashton 7efc5b77cf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-23 13:35:01 +02:00
scottashton 371bfabf67 spellchecked gitbook for general-graph and ahuacatl 2014-06-23 13:34:44 +02:00
Michael Hackstein 658fa5cc25 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-23 13:18:06 +02:00
Michael Hackstein 7e3bebead7 Sorted export ordering of graph functions in ahuacatl. First deprecated modules are exported, afterwards general graph functions 2014-06-23 13:18:00 +02:00
scottashton fa2084ea9b fixed bug in commonPorperties, now attributes with the value of 'false' are included in result, fixed js shell to full general-graph support 2014-06-23 11:37:43 +02:00
Thomas Schmidts c11417cbdb Fixed some some issues with the appearance of the Foxx Chapter 2014-06-23 09:56:08 +02:00
scottashton 62fd91ce3d changed return value of common properties so only the matching attributes are returned 2014-06-23 07:27:20 +02:00
Jan Steemann b5fe73270c use test-helper for unloading collections 2014-06-21 03:19:54 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
scottashton 1cef1a0cd7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 16:59:58 +02:00
scottashton fb7c608f6c refactored ahuacatl docs 2014-06-20 16:59:51 +02:00
Lucas Dohmen f6b7bb23a0 Remove the stub and mock module 
This is now inside of shell-foxx until it has been converted to
Jasmine
 2014-06-20 16:40:34 +02:00
Lucas Dohmen ca6a9c02ca `backbone` is now `org/arangodb/extend` 2014-06-20 16:40:34 +02:00
Frank Celler 248b3e3329 fixed typo 2014-06-20 15:59:59 +02:00
Heiko Kernbach 5ef874f8f3 merge 2014-06-20 14:58:30 +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
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 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
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
Frank Celler 9c33dec659 verbose comment 2014-06-20 13:34:22 +02:00
scottashton ec2d0e94f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 13:00:01 +02:00
scottashton ec45a40d0b changed examples in routplanner 2014-06-20 12:59:56 +02:00
Lucas Dohmen 03b4a01037 Foxx Authentication accepts all options that we support 2014-06-20 11:12:56 +02:00
Esteban Lombeyda 809d951a50 formating 2014-06-20 10:34:14 +02:00
Heiko Kernbach 3c72644b00 added functionality to download and install foxx applications from github 2014-06-20 10:30:35 +02:00
scottashton 678277981c fixed merge conflict 2014-06-20 09:59:00 +02:00
scottashton b263e38a9e docu refactoring, added more functions into graph module 2014-06-20 09:58:09 +02:00
Jan Steemann 2e734b6a9a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:53:32 +02:00
Jan Steemann 218d23d761 fixed jslint warning 2014-06-20 09:53:01 +02:00
Jan Steemann e132c8ea19 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 09:45:53 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
gschwab dbe0cbbf7f renamed _directedRelationDefinition(...) -> _directedRelation(..) 2014-06-20 09:01:35 +02:00
gschwab 639e657897 renamed _undirectedRelationDefinition(...) -> _undirectedRelation(..) 2014-06-20 08:56:59 +02:00
Jan Steemann c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann 86def51c51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-20 08:22:04 +02:00
Jan Steemann 6c0dcf85c4 WAL DDL markers 2014-06-19 14:33:38 +02:00
Lucas Dohmen 049067dbc4 Merge pull request #874 from triAGENS/foxx-doc-generator-improvements 
Foxx API Documentation explorer doesn't show POST/PUT/PATCH bodies without bodyParam
 2014-06-19 11:53:48 +02:00
Lucas Dohmen 96866a0d9f Some tweaks to the Foxx.Repository documentation 2014-06-19 10:28:36 +02:00
Lucas Dohmen e83d05d3b2 Foxx.Repository#count 2014-06-19 10:28:36 +02:00
Lucas Dohmen ca41f74a63 Foxx.Repository#updateById 2014-06-19 10:28:35 +02:00
Lucas Dohmen 473566a4e2 Foxx.Repository#updateByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 94e2d0e9a4 Foxx.Repository#replaceByExample 2014-06-19 10:28:35 +02:00
Lucas Dohmen 3bfff286d0 Foxx.Repository#remove 2014-06-19 10:28:35 +02:00
Lucas Dohmen 4b769867be Foxx.Repository#all 2014-06-19 10:28:35 +02:00
Lucas Dohmen b9d4a96652 Add simple documentation for methods without bodyParam 
post, put and patch requests without a bodyParam will now be documented
with an undocumented bodyParam. This will allow people to try out this
undocumented field in the Swagger documentation in the admin interface.
 2014-06-19 10:28:16 +02:00
Jan Steemann bded33eec8 fixed typos 2014-06-18 21:48:29 +02:00
Jan Steemann 73e3fd5551 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 21:13:51 +02:00
Jan Steemann e39737f99e no error but a warning 2014-06-18 21:13:25 +02:00
Jan Steemann 44ad4eea48 added tests for AQL write operations 2014-06-18 20:43:08 +02:00
Frank Celler 42b7014237 replaced @EXAMPLES 2014-06-18 19:44:32 +02:00
Jan Steemann 1d68586500 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-18 16:37:28 +02:00
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +02:00
Alan Plum ba61e07e02 More linting. 2014-06-18 15:21:29 +02:00
Alan Plum c9d7f113a6 Linting. 2014-06-18 15:19:12 +02:00
Frank Celler 900aa7f33b moved gharial from /system to /_api 2014-06-18 14:08:06 +02:00
Alan Plum 40f3e268dd Adjusted injector naming. 2014-06-18 11:09:40 +02:00
Alan Plum 282be72c5c Implemented controller dependency injection. 2014-06-18 01:17:10 +02:00
Lucas Dohmen 5057400e18 Repository#all 2014-06-17 17:34:55 +02:00
Lucas Dohmen df658a0648 A spec for the existing Foxx Repository functionality 2014-06-17 17:34:55 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Jan Steemann 091491d13b crash recovery tests 2014-06-17 15:30:11 +02:00
Lucas Dohmen 3c3f4b0b8f Foxx: Reorder and update the tests of Repository 2014-06-17 15:19:19 +02:00
Lucas Dohmen d57f88507b Foxx: Add examples for each of the methods of Repository 2014-06-17 15:19:19 +02:00
scottashton 094809bdf8 more docs 2014-06-17 11:43:21 +02:00
Frank Celler f794ee8368 fixed datafile debugger 
Conflicts:
	CHANGELOG
 2014-06-17 09:22:56 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Jan Steemann b303db2b50 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
 2014-06-17 00:49:18 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Frank Celler 89dbc6d04a Merge pull request #902 from triAGENS/foxx_repository 
[WIP] Foxx.Repository should provide more methods
 2014-06-16 20:16:56 +02:00
Jan Steemann 7f1c67b964 recovery tests 2014-06-16 17:22:20 +02:00
Jan Steemann 02d1cf3ea4 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 17:09:58 +02:00
scottashton ef6ed992f1 fixed typos in docs 2014-06-16 16:58:42 +02:00
Jan Steemann ff494cc897 added recovery tests (not functional yet) 2014-06-16 16:52:26 +02:00
scottashton cc3eff2a1e added documentation for ahuacatl 2014-06-16 16:33:40 +02:00
Esteban Lombeyda 19d851c3cb Merge branch 'mjmh' of github.com:triAGENS/ArangoDB into mjmh 2014-06-16 15:24:54 +02:00
Esteban Lombeyda 2405a5ffa2 read-only: unit tests for client and server side 2014-06-16 15:24:12 +02:00
scottashton 252d320795 jslinted code 2014-06-16 15:03:54 +02:00
scottashton b8d2c7f0f6 resolve merge conflict 2014-06-16 14:59:14 +02:00
Jan Steemann 59a5c1fda6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 14:47:47 +02:00
Jan Steemann 02d171412d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-16 14:47:41 +02:00
scottashton 99be3816b3 optimized dijsktra search 2014-06-16 14:44:34 +02:00
Alan Plum ef0210830b Fixed appContext reference in manifest cfg. 2014-06-16 14:43:11 +02:00
Jan Steemann 2a0e0b18d0 added many tests 2014-06-16 14:39:26 +02:00
Frank Celler 50b6533d0d added configuration to manifest, install and mount 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-16 12:57:17 +02:00
Esteban Lombeyda 51d86d8351 Merge branch 'mjmh' of github.com:triAGENS/ArangoDB into mjmh 2014-06-16 11:44:46 +02:00
Esteban Lombeyda 9af2994eb9 read-only: unit-tests 2014-06-16 10:47:48 +02:00
Jan Steemann ae6ac271e3 index rework 2014-06-14 23:40:56 +02:00
Jan Steemann 18f3471325 disabled transaction failure tests 2014-06-13 20:26:11 +02:00
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
Lucas Dohmen 80ab3968bd Foxx: Adjust structure & content of documentation and code of Repository 2014-06-13 15:47:52 +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
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
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
Jan Steemann fd7f288a59 added test case for shape movements 2014-06-05 22:23:02 +02:00