Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
4,277 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

96 Commits

Author SHA1 Message Date
Frank Celler 250726ca00 reorganisation of modules 2013-01-17 10:30:35 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Frank Celler 3826a4603e removed print.js 2013-01-06 00:23:40 +01:00
Frank Celler 337cee7606 fixed jslint warnings 2013-01-05 23:59:44 +01:00
Frank Celler 7be1c01bda removed linked in JavaScript code, separate files for 'fs' and 'console' 2013-01-05 23:24:10 +01:00
Frank Celler 51779b4a3e fixed more jslint warnings 2013-01-05 17:13:13 +01:00
Frank Celler c982962fd4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2013-01-03 09:07:14 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Jan Steemann 5349805220 issue #338 2013-01-02 17:22:08 +01:00
Jan Steemann f0aa0a8dd6 issue #338 2013-01-02 15:44:53 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Jan Steemann d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +01:00
Jan Steemann 09e204651e issue #329 pt 2 2012-12-21 23:58:44 +01:00
Jan Steemann 3ef80ee03d issue #329 pt 2 2012-12-21 23:52:04 +01:00
Jan Steemann 0fcca94874 issue #329: Allow passing script file(s) as parameters for arangosh to run 2012-12-21 22:53:05 +01:00
Jan Steemann 54cf382565 issue #329: Allow passing script file(s) as parameters for arangosh to run 2012-12-21 22:51:20 +01:00
Jan Steemann 599428859e issue #330 2012-12-21 22:01:51 +01:00
Jan Steemann 2b84d417f8 issue #330 2012-12-21 21:54:55 +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
Jan Steemann befda25f3c increased default packet size to 1 MB 2012-12-11 13:30:33 +01:00
Jan Steemann 8c7ca55512 issue #300 2012-12-01 03:15:39 +01:00
Jan Steemann 6233780862 colors! 2012-11-29 22:33:52 +01:00
Jan Steemann 1090014586 issue #297 (partly) 2012-11-29 21:25:27 +01:00
Jan Steemann a2b404123a load monkeypatches on all occasions 2012-11-20 16:50:15 +01:00
Jan Steemann b159a0539b moved monkeypatches.js to bootstrap folder and load it at all occasions, allowing graph usage from arangosh 2012-11-20 15:36:19 +01:00
Jan Steemann 2ea13cf0ed small fixes 2012-11-08 10:15:29 +01:00
Jan Steemann 66fd0b36be some small fixes 2012-11-08 10:13:28 +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
Jan Steemann f78dae4634 replaced new/delete with stack objects 2012-10-16 00:29:00 +02:00
Jan Steemann a3518aa7ca fixed memory zone 2012-10-12 22:32:47 +02:00
Jan Steemann f63d47c028 fixed request timeouts, increased max packet size for arangosh 2012-10-12 01:26:03 +02:00
Jan Steemann 3b5d4a4fc9 issue #204: allow import of tab-separated values 
this enables the user to specify the tab as separator for arangoimp.
the separator and eol values used by arangoimp can now also consist of
more than one character.

updated documentation and added test cases
 2012-09-30 01:38:32 +02:00
Jan Steemann a54e6e4a95 added man file for arangob 2012-09-28 11:58:06 +02:00
Jan Steemann 66d91c4677 also allow \n as delimiters 2012-09-28 11:32:42 +02:00
Jan Steemann 072436c16f added test cases for arangob 2012-09-27 11:56:13 +02:00
Jan Steemann 5a4a1b5fce added test cases, removed class HttpResponsePart 2012-09-27 11:04:15 +02:00
Jan Steemann 210bfe7771 generalised arangob test cases 2012-09-26 10:29:32 +02:00
Jan Steemann ce3936df9a some cleanup 2012-09-25 16:12:20 +02:00
Jan Steemann d92f359bda more test cases 2012-09-25 12:55:10 +02:00
Jan Steemann f4e8c8cf9c added test case 2012-09-25 11:52:12 +02:00
Jan Steemann 0619c9960c fixed arangob for batch requests 2012-09-25 11:46:15 +02:00
Jan Steemann 77bc98cd42 re-enabled benchmark client for single operations 2012-09-25 10:24:18 +02:00
Jan Steemann f08a788f7c removed protocol buffers 2012-09-24 13:44:30 +02:00
a-brandt fe7f2f8079 ICU changes 2012-09-24 11:40:06 +02:00
Jan Steemann e888894cdb changes to benchmark code 2012-09-24 08:57:26 +02:00