1
0
Fork 0
Commit Graph

2856 Commits

Author SHA1 Message Date
Jan Steemann 60f6148de6 updated CHANGELOG 2013-10-02 14:43:25 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Frank Celler 9228cbc2fa release version 1.4.0-beta1 2013-09-30 14:58:16 +02:00
Frank Celler ad2d4b9d76 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	VS2012/Arangod Binary/Arangod Binary.vcxproj
	VS2012/Arangoimp Binary/Arangoimp Binary.vcxproj
	VS2012/Arangosh Binary/Arangosh Binary.vcxproj
	arangod/Ahuacatl/ahuacatl-grammar.c
	js/actions/api-database.js
	js/apps/aardvark/api-docs/edges.json
	js/apps/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
2013-09-30 14:39:59 +02:00
Jan Steemann b4cdc79697 added db._id() 2013-09-30 13:44:28 +02:00
Jan Steemann 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00