1
0
Fork 0
Commit Graph

79 Commits

Author SHA1 Message Date
Jan Steemann e7f8543d81 moved documentation changes from 1.1 to devel 2012-11-23 10:18:47 +01:00
a-brandt a7c957faeb added arango-upgrade 2012-11-20 15:43:19 +01:00
Frank Celler efdad9df10 add maintainer and automagic files 2012-11-13 16:18:23 +01:00
Frank Celler 4804f2b324 fixed arangoirb compile error 2012-11-13 15:57:38 +01:00
Frank Celler 3b5a0967bc Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp
2012-10-20 22:37:25 +02:00
a-brandt c70d081fc9 one more try for centos 5 2012-10-19 16:02:31 +02:00
a-brandt fbc20e6aed added some extra options for "make on centos 5 2012-10-19 15:26:10 +02:00
Frank Celler aaf74fe8f6 fixed title for website output 2012-10-18 17:33:21 +02:00
Frank Celler e8093d68fe upgraded to Doxygen 1.8.x 2012-10-18 16:38:20 +02:00
a-brandt 451cea6c4c bugfix wrong user 2012-10-17 12:04:16 +02:00
a-brandt b98e7671f0 bugfix wrong user 2012-10-17 12:03:01 +02:00
a-brandt 45c0f7d937 updates 2012-10-17 10:27:50 +02:00
a-brandt 07d1dfa2fc added "--build x86_64-apple-darwinXX.XX.XX" for MacOS X 2012-10-17 09:38:11 +02:00
a-brandt 83be41d2f0 disabled "mruby" 2012-10-16 17:23:42 +02:00
a-brandt 1b197a7bba configure options changed 2012-10-16 16:18:35 +02:00
a-brandt b1f25fc7e3 deleted "--enable-all-in-one" 2012-10-16 15:42:35 +02:00
a-brandt a192d73969 deleted "--enable-all-in-one" 2012-10-16 15:41:40 +02:00
a-brandt 3545ed527c added "make setup" 2012-10-16 15:05:17 +02:00
a-brandt b0f69deaf9 added "make setup" 2012-10-16 15:04:22 +02:00
Frank Celler c0c869d1ff Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/ArangoShell/ArangoClient.cpp
	js/client/js-client.h
2012-10-13 16:28:09 +02:00
Jan Steemann e4966844f4 remove invalid configure option 2012-10-11 23:16:45 +02:00
Frank Celler 939c5ece15 Merge branch '1.0' of github.com:triAGENS/ArangoDB
Conflicts:
	CHANGELOG
	CONTRIBUTING.md
	Doxygen/arango-html.doxy
	Doxygen/arango-latex.doxy
	Doxygen/arango-xml.doxy
	Doxygen/arango.template
	Makefile.in
	Makefile.local
	Makefile.unittests
	VERSION
	config/config.sub
	configure
	configure.ac
	js/actions/system/api-system.js
	js/client/js-client.h
	js/common/bootstrap/js-modules.h
	js/server/js-ahuacatl.h
	packetize.sh
2012-10-11 15:19:44 +02:00
Jan Steemann 6b24c5d7f9 fixed typo, change publish-html 2012-10-09 10:58:10 +02:00
a-brandt d869ff6b7d bugfix: chown arangod /var/run/arangodb 2012-09-25 17:48:13 +02:00
a-brandt 3cb61773e5 bugfix: wrong user 2012-09-25 17:15:22 +02:00
a-brandt e6f114e0cf added "--enable-mruby" 2012-09-25 17:05:40 +02:00
a-brandt cafcabeea5 disabled mruby 2012-09-25 16:46:55 +02:00
a-brandt c31a614ac1 changed datadir to /var/lib 2012-09-25 16:13:05 +02:00
a-brandt 791f90ffd6 bugfix 2012-09-25 16:02:32 +02:00
a-brandt 413510dcda changed path to arangod.conf 2012-09-25 16:00:55 +02:00
a-brandt e3793d6a14 changes for next version 2012-09-25 12:04:40 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Frank Celler 82864cc246 added Short-Description 2012-09-02 11:59:44 +02:00
Frank Celler f92b804ade moved default database directory 2012-09-02 10:25:28 +02:00
Frank Celler 85a36b2cfc using prg name for init-script 2012-09-01 22:53:53 +02:00
Frank Celler b755e22245 renamed web to doc for inclusion in /usr/share 2012-08-31 23:24:24 +02:00
Jan Steemann 580915ca17 changed Makefiles for Doxygen. Generated documentation is now located in Doxygen/, sources are in Documentation/ 2012-08-31 12:04:32 +02:00
Frank Celler 2ab77278d9 changes to allow SUBDIR build 2012-08-30 18:06:23 +02:00
Frank Celler 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Frank Celler fa41864b7a Merge remote-tracking branch 'origin/1.0' into devel
Conflicts:
	Installation/MacOSX/MacPorts/arango.conf
	Installation/arangod.conf.in
	Makefile.in
	arangod/RestServer/ArangoServer.h
	configure
	lib/V8/v8-utils.cpp
2012-08-18 09:00:43 +02:00
Frank Celler 8970ff1558 fixed for issue #149: Inconsistent port for admin interface 2012-08-10 13:59:39 +02:00
Frank Celler 69a8e64f9b Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	.gitignore
	Makefile.in
	Makefile.local
	Makefile.unittests
2012-08-09 15:25:29 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
2012-08-05 22:46:55 +02:00
Frank Celler aa2cd1c77b fix startup 2012-08-05 21:44:03 +02:00
Frank Celler 81fd398bd2 added timeout 2012-08-05 20:51:23 +02:00
Frank Celler 0d335f3b60 fixed paths for html files 2012-08-05 16:47:00 +02:00
Frank Celler f761e618be fix for issue #134: improvements for centos RPM 2012-08-03 13:26:35 +02:00
Frank Celler 4c404dc095 partial fix for issue #134 "improvements for centos RPM" 2012-08-03 13:11:24 +02:00
Frank Celler d7b2617348 fixed disable-admin-interface switch 2012-08-03 09:05:11 +02:00
Frank Celler b0e452f74a Merge branch 'master' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.am
	Makefile.in
	arangod/V8Server/v8-vocbase.cpp
2012-08-02 17:17:36 +02:00