1
0
Fork 0
Commit Graph

5 Commits

Author SHA1 Message Date
Jan Steemann b8e7d5634d issue #153: edge collection should be a flag for a collection 2012-08-28 10:48:24 +02:00
Jan Steemann eeeb78c2e7 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Installation/arangod.conf.in
	Makefile.in
	arangod/Makefile.files
	arangod/RestHandler/RestBatchHandler.cpp
	arangod/RestHandler/RestBatchHandler.h
	arangod/RestServer/ArangoServer.cpp
	bin/arango-password.in
2012-07-26 12:03:03 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Frank Celler f126016484 added ExtractShapedJsonVocShaper 2012-07-16 15:42:41 +02:00
Frank Celler a02faec3a3 added basic authentication 2012-07-15 17:06:59 +02:00