1
0
Fork 0
Commit Graph

327 Commits

Author SHA1 Message Date
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
2012-07-24 22:56:03 +02:00
Jan Steemann a910971b15 fixed documentation & installation settings after endpoint introduction 2012-07-24 08:42:45 +02:00
Frank Celler bc3d08d5c6 Merge branch 'master' of github.com:triAGENS/ArangoDB into 1.0 2012-07-16 17:57:07 +02:00
a-brandt 72626a5abf changed owner of logfile directory 2012-07-16 17:28:01 +02:00
Frank Celler 16407018d7 fixed relative paths 2012-07-16 13:45:13 +02:00
a-brandt 601b10da66 changes for mac os x 2012-07-09 16:08:51 +02:00
Frank Celler dfbc224571 create log dir 2012-06-30 11:26:22 +02:00
Frank Celler 7c0c4e9c0b fixed installation paths 2012-06-30 11:14:25 +02:00
Frank Celler b0839ae8b1 fixed installtion paths 2012-06-30 11:12:06 +02:00
Frank Celler 27ba3fc0dc fixed installation paths 2012-06-30 10:59:39 +02:00
Frank Celler d69586beb0 fixed installation issures 2012-06-30 10:32:50 +02:00
Frank Celler 3b3e881c85 added homebrew file 2012-06-29 15:44:12 +02:00
a-brandt 7a109540a7 added missing "bin/" 2012-06-25 10:29:37 +02:00
a-brandt 381cea5272 updates for packetize 2012-06-21 15:40:37 +02:00
a-brandt 67a5a45e52 packetize changes for MacOSX 2012-06-21 14:16:03 +02:00
a-brandt d134b1d73e packetize updates 2012-06-21 12:50:02 +02:00
a-brandt 6bf21ef153 packetize updates 2012-06-21 11:31:11 +02:00
a-brandt cf389b9146 epm changes 2012-06-20 17:36:59 +02:00
a-brandt efb9c5b041 added a default configuration file 2012-06-20 16:57:22 +02:00
a-brandt 9f69bcd526 Added packetize.sh for epm 2012-06-20 16:53:10 +02:00
Frank Celler d7379b2508 renamed Avocado to Arango 2012-05-12 14:51:33 +02:00
Frank Celler 763e7aba98 renamed to Arango 2012-05-12 14:40:34 +02:00
Frank Celler 29380360b4 added a Portfile 2012-02-22 16:34:48 +01:00
Frank Celler f3f4b16518 added user and group info 2012-02-22 16:27:51 +01:00
Frank Celler a9e0bcf17e use localhost under MacOS 2012-02-22 16:12:16 +01:00
Frank Celler c914882a7f added conf file 2012-02-22 13:24:14 +01:00
Frank Celler 17b333ffbf added installation for MacPorts 2012-02-20 18:02:30 +01:00