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

177 Commits

Author SHA1 Message Date
Jan Steemann 31e21ec092 fix error message on arangosh and arangoimp startup when no connection can be made 2013-01-29 14:27:55 +01:00
Jan Steemann 17098dd4ef added support for HTTP OPTIONS method, pt 1 2013-01-25 19:11:33 +01:00
Jan Steemann 4e5a9e0f4e windows is not GNU 2013-01-22 18:06:34 +01:00
Jan Steemann 44890296f3 windows is not GNU 2013-01-22 18:03:42 +01:00
Jan Steemann 7254487e14 added --progress option for arangoimp. make arangod show import errors 2013-01-22 15:04:06 +01:00
Frank Celler edef5feacc fixed tests 2013-01-17 23:45:19 +01:00
Frank Celler 159f613169 more cleanup 2013-01-17 18:24:58 +01:00
Frank Celler 3c21a87366 more cleanup 2013-01-17 16:01:15 +01:00
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
Jan Steemann 33ad3e5e2b no passwd prompt for jslint 2013-01-14 14:25:47 +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
Jan Steemann 63805cf84c a few small fixes for logging 2013-01-03 14:47:16 +01:00
Jan Steemann 132143289d a few small fixes for logging 2013-01-03 14:45:56 +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 3afc0cdad2 added option '--server.disable-authentication' for arangosh as well 2012-12-21 22:17:19 +01:00
Jan Steemann 2abf581fb7 added option '--server.disable-authentication' for arangosh as well 2012-12-21 22:15:55 +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 9155b400c2 some fixes for readline 2012-12-18 12:25:04 +01: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 56cd3327a6 merge problems 2012-10-22 21:51:23 +08: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
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 a3518aa7ca fixed memory zone 2012-10-12 22:32:47 +02:00
Jan Steemann cc371c4eb0 centralised and unified bye message 2012-10-12 21:46:58 +02:00
Jan Steemann f63d47c028 fixed request timeouts, increased max packet size for arangosh 2012-10-12 01:26:03 +02:00
Frank Celler 6f426a2cd3 Auf Wiedersehen in Greek 2012-10-11 20:07:40 +02:00
Frank Celler 27cf9d9b04 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	3rdParty/Makefile.all-in-one-zeromq
	Makefile.in
	js/actions/system/api-blueprint.js
	js/actions/system/api-system.js
 2012-10-11 14:33:31 +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
Jan Steemann 029c840b09 fixed a memleak 2012-10-09 14:49:45 +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 8eb4ee0311 added arangob options 2012-09-28 17:06:20 +02:00
Jan Steemann aad951e2ab added collection dropping & creation 2012-09-28 15:11:14 +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 fa7ef5bc16 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-25 11:52:26 +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
a-brandt 1f75805754 disabled arangob 2012-09-25 10:00:10 +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
Jan Steemann bea699b734 some fix for json conversion 2012-09-21 09:26:53 +02:00
Jan Steemann 61d49924be more binary handling 2012-09-20 13:11:33 +02:00
Jan Steemann 879573944c bugfixes, accept longer binary messages 2012-09-20 11:33:14 +02:00
Jan Steemann 29778d0b4d added binary client 2012-09-19 18:03:43 +02:00
Jan Steemann 56ab94678a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-09-19 15:48:55 +02:00
Jan Steemann 7bd8063468 before adding binary protocol 2012-09-19 15:48:24 +02:00
a-brandt d51383d081 Added HAS_ICU to shell and console 2012-09-19 11:23:23 +02:00
Jan Steemann 7cee00a060 fixed g++ compile error 2012-09-19 10:32:01 +02:00
Jan Steemann 957e566b92 fixed compile errors in clang++ 2012-09-19 09:00:17 +02:00
Jan Steemann 876b9219cc some figures output 2012-09-18 18:55:46 +02:00
Jan Steemann 614187c885 draft of benchmark client 2012-09-18 18:25:33 +02:00
a-brandt d077c97f2c ICU updates 2012-09-18 15:42:46 +02:00
a-brandt 3019983dc7 ICU changes 2012-09-18 10:41:37 +02:00
a-brandt 3666069569 Added UTF8/UTF16 normalize and compare functions (uses libicu) 2012-09-17 09:49:41 +02:00
Frank Celler f0161a539b removed JsonParserX 2012-09-13 09:46:10 +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 80373334b3 removed dependency on JsonParserX and Variant*, fixed a small memleak 2012-09-06 16:44:25 +02:00
Jan Steemann ad2bb9273c fixed clang warnings "in-class initializer for static data member of type xxx is a GNU extension" 2012-09-03 08:32:06 +02:00
Jan Steemann e4e73a7a56 issue #169: missing argument for simple queries 2012-08-31 17:32:53 +02:00
Jan Steemann 92b5d1cbba fixed ASCII art error after password entry 2012-08-31 13:30:04 +02:00
Frank Celler 516cfea36b moved to ArangoClient 2012-08-31 08:54:40 +02:00
Frank Celler 2ab77278d9 changes to allow SUBDIR build 2012-08-30 18:06:23 +02:00
Frank Celler bb6f099b24 changes to allow SUBDIR build 2012-08-30 17:40:03 +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