7 Commits

Author	SHA1	Message	Date
a-brandt	1c0578c2b5	Merge branch 'devel' into multiple_databases ... Conflicts: arangod/RestServer/ArangoServer.cpp arangod/VocBase/vocbase.c lib/HttpServer/ApplicationEndpointServer.cpp lib/HttpServer/ApplicationEndpointServer.h lib/HttpServer/HttpCommTask.h lib/HttpServer/HttpHandlerFactory.cpp lib/HttpServer/HttpHandlerFactory.h lib/Rest/HttpRequest.cpp lib/Rest/HttpRequest.h	2013-06-03 17:05:01 +02:00
Jan Steemann	2c381d5d6a	issue #498	2013-05-02 12:27:06 +02:00
a-brandt	fcae2b2961	added RequestContext	2013-04-17 16:56:48 +02:00
Frank Celler	1aa5109fa3	updated disclaimer	2013-03-13 17:03:18 +01:00
Jan Steemann	dbcc86171f	added more crash-protection when reading corrupted collection files at startup	2013-02-06 12:34:53 +01:00
Jan Steemann	cdbb96788f	issue #313	2012-12-03 15:30:01 +01:00
Frank Celler	a02faec3a3	added basic authentication	2012-07-15 17:06:59 +02:00