1
0
Fork 0
Commit Graph

36 Commits

Author SHA1 Message Date
Frank Celler 456d089deb generateSwagger can now also parse MD files
Conflicts:
	js/apps/system/aardvark/api-docs/batch.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/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
	js/apps/system/aardvark/api-docs/version.json
2014-03-26 23:09:07 +01:00
scottashton 09e5069ec8 cleaned up merge mess 2014-03-03 15:24:10 +01:00
scottashton 6c3a3717d0 fixed cluster chart 2014-03-03 15:12:11 +01:00
Jan Steemann 32fe5cf684 updated api-docs 2014-03-03 12:03:33 +01:00
Frank Celler 33b15d7660 release version 2.0.0-rc1 2014-03-02 08:06:31 +01:00
Frank Celler 05e30a6b3e release version 2.0.0-beta2 2014-02-28 23:27:58 +01:00
Frank Celler c2706fd737 release version 2.0.0-beta1 2014-02-28 20:44:44 +01:00
Frank Celler dc7f16e2ae release version 2.0.0-alpha1 2014-02-27 13:28:13 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
2014-02-27 09:13:03 +01:00
Frank Celler 066d867f02 release version 1.4.10 2014-02-21 12:46:12 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.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/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
2014-02-09 18:39:11 +01:00
Frank Celler 0bc50d9d10 release version 1.4.9 2014-02-07 21:45:05 +01:00
Frank Celler bd69ad9843 release version 1.4.8 2014-01-27 13:36:41 +01:00
Frank Celler 6679995e76 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	Documentation/man/man1/arangob.1
	Documentation/man/man1/arangodump.1
	Documentation/man/man1/arangoimp.1
	Documentation/man/man1/arangorestore.1
	Documentation/man/man1/arangosh.1
	Documentation/man/man8/arango-dfdb.8
	Documentation/man/man8/arangod.8
	Documentation/man/man8/foxx-manager.8
	Documentation/man/man8/rcarangod.8
	Makefile.in
	VERSION
	aclocal.m4
	build.h
	config/config.guess
	config/config.sub
	config/missing
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/server/bootstrap/module-internal.js
	js/server/modules/org/arangodb/actions.js
	js/server/modules/org/arangodb/foxx/authentication.js
	js/server/modules/org/arangodb/foxx/manager.js
	lib/ApplicationServer/ApplicationServer.cpp
2014-01-23 22:24:20 +01:00
Frank Celler fdee836023 release version 1.4.7 2014-01-23 17:13:52 +01:00
Frank Celler 251c2fa448 release version 1.4.6 2014-01-20 22:09:44 +01:00
Frank Celler 39ea33a68e release version 1.4.5 2014-01-15 14:35:35 +01:00
Frank Celler 9a68feaa98 release version 1.4.5-rc2 2014-01-13 14:34:55 +01:00
Frank Celler 5455f2eeee release version 1.4.5-rc1 2014-01-03 15:00:51 +01:00
Frank Celler 684464c935 release version 1.4.4 2013-12-24 10:15:45 +01:00
Frank Celler 046eb9df9d release version 1.4.4-rc1 2013-12-22 18:28:12 +01:00
Frank Celler de322b61f3 release version 1.4.3 2013-11-25 11:08:28 +01:00
Frank Celler 5a867e7392 release version 1.4.3-alpha1 2013-11-22 22:06:37 +01:00
Frank Celler 228d484c4c release version 1.4.2 2013-11-20 13:51:08 +01:00
Frank Celler c28db3076d release version 1.4.1 2013-11-08 12:57:34 +01:00
Frank Celler 058f435b1c release version 1.4.1-rc1 2013-11-07 20:51:47 +01:00
Jan Steemann 4533b6feaa removed some old example files 2013-10-30 01:27:15 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Frank Celler ff36cad3a8 release version 1.4.0 2013-10-29 11:27:35 +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
Jan Steemann 7dc8ed7c47 issue #617: Swagger API is missing '/_api/version' 2013-10-17 11:55:39 +02:00
Jan Steemann d71ee7ff6f fixed issue #615 2013-10-17 11:12:02 +02:00
Jan Steemann d47aab1950 allow /_api/logs only for the `_system` database 2013-10-07 14:23:48 +02:00
Jan Steemann dc69d6fa60 updated documentation 2013-10-02 17:54:39 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Jan Steemann 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00