1
0
Fork 0
Commit Graph

75 Commits

Author SHA1 Message Date
Esteban Lombeyda 8ab6290d65 Bug fix: tabulators work correct under microsoft windows. Needs 49ee3f0d0fc80cce300427a2ddbf519c61a7cb24
of ArangoDB-Windows
2014-02-07 16:30:04 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Frank Celler 973f9aa2fb added linenoise 2014-01-30 17:23:24 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01:00
Jan Steemann 1b08bc6582 start up the HTTP server when starting ArangoDB in console mode 2014-01-27 09:45:26 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Jan Steemann 46a295ba43 fixed some Windows warnings 2013-10-08 12:39:47 +02:00
Jan Steemann 3e6daf63d2 fixed typos in comments 2013-09-20 23:12:22 +02:00
Jan Steemann 9c95582703 fixed leak in completions generator 2013-09-16 10:33:42 +02:00
Jan Steemann 80362ec82f fixed issues reported by cppcheck 2013-07-11 10:02:27 +02:00
Frank Celler 97e61c77d5 added escape check 2013-04-05 14:47:58 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann 9155b400c2 some fixes for readline 2012-12-18 12:25:04 +01:00
Jan Steemann e5ad8f6612 ifdef for readline version 2012-12-18 11:43:11 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
2012-11-27 12:34:58 +01:00
Jan Steemann 5a14e6904b fixed readline ambiguous completion on Ubuntu 2012-11-23 23:33:40 +01:00
Jan Steemann e3ea632773 issue #289 2012-11-22 10:32:29 +01:00
Jan Steemann a0fd0f6c87 issue #289 2012-11-22 10:30:12 +01:00
Jan Steemann ecbebaa60e issue #289 2012-11-22 10:21:58 +01:00
Jan Steemann 224e37a1ba fix some memory issues 2012-10-11 22:49:46 +02:00
a-brandt 3666069569 Added UTF8/UTF16 normalize and compare functions (uses libicu) 2012-09-17 09:49:41 +02:00
Frank Celler 55ebf00dbd Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	Actions/RestActionHandler.cpp
	Actions/RestActionHandler.h
	Makefile.files
	Makefile.in
	RestHandler/RestActionHandler.cpp
	RestHandler/RestActionHandler.h
	RestServer/ActionDispatcherThread.cpp
	RestServer/ActionDispatcherThread.h
	RestServer/RubyDispatcherThread.cpp
	RestServer/RubyDispatcherThread.h
	arangod/RestHandler/RestActionHandler.cpp
	arangod/RestHandler/RestActionHandler.h
	arangod/RestServer/ActionDispatcherThread.cpp
	arangod/RestServer/ActionDispatcherThread.h
	arangod/RestServer/ArangoServer.cpp
2012-06-08 15:57:33 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00