1
0
Fork 0
Commit Graph

12 Commits

Author SHA1 Message Date
Frank Celler ff36cad3a8 release version 1.4.0 2013-10-29 11:27:35 +01:00
Frank Celler ebca4c601e Merge remote-tracking branch 'origin/devel' into 1.4 2013-10-29 11:18:27 +01:00
Jan Steemann 2e301f118d issue #648: /batch API is missing from Web Interface API Docummentation (Swagger) 2013-10-29 04:43:34 +01:00
Frank Celler d33bcdc623 rc1 2013-10-28 17:54:24 +01:00
Jan Steemann 7dc8ed7c47 issue #617: Swagger API is missing '/_api/version' 2013-10-17 11:55:39 +02:00
Frank Celler d8ea801111 regenerated swagger 2013-10-14 14:05:38 +02:00
Frank Celler be162a1e35 Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.4
Conflicts:
	CHANGELOG
	Documentation/Manual/NewFeatures14.md
	Documentation/Manual/NewFeatures14TOC.md
	Documentation/Manual/Upgrading14.md
	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/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.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
	js/apps/system/aardvark/api-docs/traversal.json
2013-10-14 14:00:29 +02:00
Jan Steemann d47aab1950 allow /_api/logs only for the `_system` database 2013-10-07 14:23:48 +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 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00