1
0
Fork 0
Commit Graph

8 Commits

Author SHA1 Message Date
a-brandt c2d0749178 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestHandler/RestDocumentHandler.cpp
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/RestHandler/RestImportHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/document-collection.c
	arangod/VocBase/document-collection.h
	arangod/VocBase/primary-collection.c
	arangod/VocBase/primary-collection.h
2012-10-24 10:46:38 +02:00
a-brandt 9a599e468a added "_key" attribute 2012-10-23 15:58:09 +02:00
a-brandt 73c5cadcdd added a icu test 2012-10-10 15:33:54 +02:00
Jan Steemann 9ffa4779e2 test cases for issue #213 2012-10-10 09:22:18 +02:00
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Frank Celler 95313be897 renamed /document => /_api/document 2012-05-22 16:31:47 +02:00
Frank Celler 763e7aba98 renamed to Arango 2012-05-12 14:40:34 +02:00
Frank Celler 63841e50f4 renamed 2012-04-30 11:25:12 +02:00