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

1609 Commits

Author SHA1 Message Date
Jan Steemann 8b9cdbe075 fixed tests 2014-06-18 16:34:11 +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
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