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

5271 Commits

Author SHA1 Message Date
Jan Steemann ff494cc897 added recovery tests (not functional yet) 2014-06-16 16:52:26 +02:00
Jan Steemann 2c4faa21b4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-16 14:49:08 +02:00
Jan Steemann 9690c26d67 jslint 2014-06-16 14:48:52 +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
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
gschwab 7318417cf8 made make 2014-06-16 14:36:28 +02:00
gschwab 2514183982 jslint 2014-06-16 14:30:42 +02:00
gschwab 229834f5a4 fixed merge conflicts 2014-06-16 14:27:47 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +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
Michael Hackstein fdd2b6f791 Moved newest version of general graph into web interface 2014-06-16 09:09:05 +02:00
Michael Hackstein dc3e3703cc Solved uniqueness conflicts for generated examples 2014-06-15 23:12:26 +02:00
Michael Hackstein b8e96d54ba Started adding examples to the http graph module 2014-06-15 22:42:51 +02:00
Jan Steemann ae6ac271e3 index rework 2014-06-14 23:40:56 +02:00
Jan Steemann 3301813f3c added missing client-side function 2014-06-13 21:39:35 +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 b986d7baf6 Fixes #894 in Safari + Chrome. Firefox is broken due to a bug in our jQuery version (offset is returning a random value...). IE to be tested. 2014-06-13 17:32:28 +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
Michael Hackstein 7541149200 Added functions to list all graphs and all vertex/edge collections of a specific graph to http-api 2014-06-13 15:11:59 +02:00
Jan Steemann d7f35bcc7b fixed datafile ticks issues 2014-06-13 14:46:21 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
Michael Hackstein 8e9ffb5950 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx.js
	js/server/modules/org/arangodb/foxx/request_context.js
 2014-06-13 13:23:56 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
gschwab 121b667078 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-13 11:51:23 +02:00
gschwab 0646677b3e orphan collections treatment added with edit edge definitions 2014-06-13 11:51:15 +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 9e03189fb0 added waitUnload as a test helper function 2014-06-13 11:31:14 +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 ecc0768bf3 Fixed JSLint warnings 2014-06-13 09:56:07 +02:00
Michael Hackstein ba3a3914fa Included change of existing edge definition in graph-http-module 2014-06-13 09:49:33 +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
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 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