1
0
Fork 0
Commit Graph

126 Commits

Author SHA1 Message Date
Jan Steemann 670393f660 updated CHANGELOG 2013-11-04 17:33:50 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 21d25d0ccc removed resourceholder 2013-10-17 10:43:07 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 5d093576e2 fix a few -pedantic errors 2013-01-23 08:58:54 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
2013-01-05 11:16:50 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
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
Oreste Panaia 857b66c490 windows version 2012-12-06 20:44:01 +08:00
Jan Steemann 2efa2f32db added server version check 2012-11-20 09:27:28 +01:00
Jan Steemann 85a8f56a34 complain about non-expected database directory versions 2012-11-20 01:41:41 +01:00
Jan Steemann 3718f3570d ALL() moved to transaction semantics 2012-11-19 13:07:38 +01:00
Jan Steemann 38025fbc31 documents and edges are now created using transaction contexts 2012-11-16 15:36:44 +01:00
Jan Steemann b416bc1a4b removed JsonContainer, introduced more general ResourceHolder class 2012-11-16 13:29:19 +01:00
Jan Steemann 4cf6cc6a33 replaced new/delete with stack objects 2012-10-16 00:27:02 +02:00
Jan Steemann cc371c4eb0 centralised and unified bye message 2012-10-12 21:46:58 +02:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
Oreste Panaia 5d79b618c7 strings converted to char* 2012-10-01 18:36:42 +08:00
Oreste Panaia 2a71a3c371 minor changes for windows compatability 2012-09-28 17:34:22 +08:00
Frank Celler af60ebe612 fixed doc errors 2012-06-24 16:43:20 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00