1
0
Fork 0
Commit Graph

101 Commits

Author SHA1 Message Date
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann b16f672902 fixed some log errors on startup & shutdown 2012-12-10 15:18:35 +01:00
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Frank Celler cccb3511c5 fixed documentation again 2012-11-21 17:42:13 +01:00
Frank Celler 18bfd048ef fixed documentation 2012-11-21 10:58:29 +01:00
Oreste Panaia 4d8d78e880 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
	arangod/Actions/RestActionHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	lib/ApplicationServer/ApplicationServer.cpp
2012-10-22 21:04:12 +08:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08: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
Frank Celler e8093d68fe upgraded to Doxygen 1.8.x 2012-10-18 16:38:20 +02:00
Jan Steemann d2d7896846 moved classes to separate files 2012-10-17 15:23:10 +02:00
a-brandt 33a463e4d1 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-10-17 10:28:43 +02:00
a-brandt 45c0f7d937 updates 2012-10-17 10:27:50 +02:00
a-brandt 38fc1d21f5 bugfix IPv6 addresses 2012-10-17 10:23:03 +02:00
Achim Brandt 5c3e10de70 bugfix IPv6 endpoint 2012-10-16 21:14:18 +02:00
Frank Celler f1eaaa7f04 fixed doc issue, doxygen sometimes does not recognize the used namespace 2012-10-16 17:34:54 +02:00
Jan Steemann 7fc079d30a merge several fixes from devel into 1.1 2012-10-16 11:44:39 +02:00
Jan Steemann 29571a2e3a issue #231: handle more client error cases 2012-10-16 11:33:49 +02:00
Jan Steemann 1b93b7379a issue #231: handle some obviously invalid requests 2012-10-15 19:10:00 +02:00
Jan Steemann d23555cfe1 issue #231: handle some obviously invalid requests 2012-10-15 19:09:01 +02:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
Jan Steemann 97723bbdf6 removed --enable-ssl configure option
having OpenSSL installed is now a requirement for compiling ArangoDB
2012-10-10 14:55:18 +02:00
Jan Steemann 994a3e3424 issue #224: allow optional content-id for batches
this allows clients to send a content-id for each batch part
the server will return the content-id in each part response so the client can more easily map requests and responses

the content-id will not be validated or checked for uniqueness by the server. it is up to the client to send sensible content-ids to the server
currently, the server will not store the content-ids anywhere. they are just used within one batch request and then "forgotten"
2012-10-09 14:50:20 +02:00
Oreste Panaia aac17f7b55 wrapper for memory mapped files add 2012-10-05 18:31:13 +08:00
Oreste Panaia fd497eccae VS 2012-09-28 23:46:33 +08:00
Jan Steemann 3801d6df8a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-28 11:58:45 +02:00
Oreste Panaia 928ee5525a Don't ask 2012-09-28 18:53:17 +08:00
Oreste Panaia 6bdf3ae565 usual mysteries with git
Conflicts:
	lib/Rest/Endpoint.cpp
2012-09-28 17:56:05 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Jan Steemann 66d91c4677 also allow \n as delimiters 2012-09-28 11:32:42 +02:00
Jan Steemann c7b2c506af added startup option --server.backlog-size 2012-09-27 17:06:24 +02:00
Jan Steemann bcd521f44f removed unused subclass HttpRequestPlain. we only have HttpRequest from now on 2012-09-27 11:24:20 +02:00
Jan Steemann 5a4a1b5fce added test cases, removed class HttpResponsePart 2012-09-27 11:04:15 +02:00
Oreste Panaia a4d551653d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-26 19:11:18 +08:00
Oreste Panaia ba63b36b53 With git you never know 2012-09-26 19:10:48 +08:00
Jan Steemann 210bfe7771 generalised arangob test cases 2012-09-26 10:29:32 +02:00
Jan Steemann 6def99c226 changed method visibility, cleanup 2012-09-26 09:32:42 +02:00
Jan Steemann a57a7bdb8a micro optimisations (root of all ...) 2012-09-25 19:08:00 +02:00
Jan Steemann 0619c9960c fixed arangob for batch requests 2012-09-25 11:46:15 +02:00
Jan Steemann bf7ddd5356 added X-Arango headers 2012-09-25 09:41:29 +02:00
Jan Steemann 4ad85e7037 added HttpResponsePart class 2012-09-24 16:59:19 +02:00
Jan Steemann f08a788f7c removed protocol buffers 2012-09-24 13:44:30 +02:00
Jan Steemann bea699b734 some fix for json conversion 2012-09-21 09:26:53 +02:00
Jan Steemann 18cd515737 added protobuf to json converter 2012-09-20 18:14:00 +02:00
Jan Steemann 29778d0b4d added binary client 2012-09-19 18:03:43 +02:00
Jan Steemann 7bd8063468 before adding binary protocol 2012-09-19 15:48:24 +02:00
Frank Celler 5c32ae5869 removed boost exceptions 2012-09-13 15:09:02 +02:00
Frank Celler 49b19e4657 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	lib/BasicsC/terminal-utils-posix.c
	lib/BasicsC/terminal-utils.c
	lib/SimpleHttpClient/SimpleHttpResult.cpp
2012-09-12 23:49:14 +02:00
Frank Celler e8089d86a7 removed user manager 2012-09-12 23:37:39 +02:00
Jan Steemann f8deb40580 issue #193: REST API HEAD request returns a message body on 404 2012-09-11 00:11:26 +02:00