1
0
Fork 0
arangodb/js/server/modules/org/arangodb
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
..
actions started development mode 2013-01-18 00:02:10 +01:00
foxx Merge remote-tracking branch 'origin/1.4' into devel 2014-01-23 22:24:20 +01:00
actions.js Merge remote-tracking branch 'origin/1.4' into devel 2014-01-23 22:24:20 +01:00
ahuacatl.js fixed reference to unused variable 2014-01-23 16:48:24 +01:00
aql-helper.js use AQL LIMIT but still return the unlimited count value 2013-08-19 18:41:00 +02:00
arango-collection.js English 2013-05-10 14:06:15 +02:00
arango-database.js updated documentation 2013-09-24 13:40:58 +02:00
arango-statement.js use AQL LIMIT but still return the unlimited count value 2013-08-19 18:41:00 +02:00
formatter.js Added unittests for structures 2013-06-18 15:56:01 +02:00
foxx.js Foxx: Foxx.Application is now Foxx.Controller [BREAKING CHANGE] 2013-09-04 10:43:39 +02:00
graph.js ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
parser.js moved errors to arangodb, fixed lslint warning 2013-01-06 12:09:40 +01:00
replication.js added server-id method 2013-08-01 18:27:42 +02:00
shaped-json.js cleanup of internal, fs, console 2013-03-31 00:10:48 +01:00
simple-query.js use skiplist index in byExample 2013-11-16 01:20:33 +01:00
users.js split users module in client- and server-specific parts 2013-02-21 17:41:38 +01:00
validator.js moved errors to arangodb, fixed lslint warning 2013-01-06 12:09:40 +01:00