1
0
Fork 0
Commit Graph

409 Commits

Author SHA1 Message Date
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangosh/V8Client/arangosh.cpp
2014-02-26 21:34:34 +01:00
Jan Steemann cfae17c667 make SYS_UNIT_TESTS_RESULT writeable 2014-02-26 13:36:01 +01:00
Jan Steemann 0ac7ddaaf9 fix shell client test results 2014-02-25 15:43:57 +01:00
Jan Steemann 7f236650ff fix database name in prompt 2014-02-24 14:46:58 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
2014-02-18 08:50:27 +01:00
Frank Celler 73f2be8a33 removed check-server 2014-02-15 23:34:24 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
2014-02-12 12:53:08 +01:00
Jan Steemann 859dd2a9d8 better handling of --javascript.package-path 2014-02-12 09:59:23 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
2014-02-11 15:52:49 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Jan Steemann 83b0cd8e5b fixed segfault 2014-01-30 18:46:34 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01:00
Jan Steemann 587c2aef64 issue #744
Conflicts:
	lib/ApplicationServer/ApplicationServer.cpp
2014-01-23 09:58:18 +01:00
Jan Steemann 724c5baa70 issue #737: adjusted error message 2014-01-21 15:23:58 +01:00
Jan Steemann 2f20f8b75f slightly updated error messages 2014-01-18 01:46:48 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 1ef596733d arangosh now uses config file name corresponding to binary name 2013-12-20 23:49:16 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Jan Steemann 865b70862e some minor adjustments for arangodump and arangorestore 2013-12-13 11:54:00 +01:00
Jan Steemann 69a462e785 some minor adjustments for arangodump and arangorestore 2013-12-13 11:52:52 +01:00
Jan Steemann fb9f9f7d26 updated Windows build 2013-11-20 15:37:11 +01:00
Frank Celler 2c3ea751c6 added missing file 2013-11-20 09:47:07 +01:00
Frank Celler f35347098b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-20 09:20:51 +01:00
Frank Celler d5b608cb79 cosmetics 2013-11-20 09:19:58 +01:00
Jan Steemann 920d08d855 removed redundant startup options 2013-11-20 01:50:27 +01:00
Jan Steemann a18c6cc98e fix character input in Windows arangosh for characters introducted with ALT-GR 2013-11-12 20:37:56 +01:00
Jan Steemann 9aaaf812c4 add --code-page option for Windows 2013-11-12 20:34:24 +01:00
Jan Steemann 670393f660 updated CHANGELOG 2013-11-04 17:33:50 +01:00
Jan Steemann d49b754f49 fixed logging in arangosh 2013-10-31 19:01:18 +01:00
Jan Steemann 4ad95f8b53 fixed logging in arangosh 2013-10-31 18:43:00 +01:00
Jan Steemann dd9802b1b8 show error details in arangoimp
Conflicts:
	arangosh/V8Client/ImportHelper.cpp
2013-10-30 12:14:17 +01:00
Jan Steemann 41869d25bd show error details in arangoimp 2013-10-30 12:11:44 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann 0a6148f2d6 fixed some VS complaints 2013-10-16 17:27:35 +02:00
Jan Steemann cd5d228e77 moved path checks from --upgrade to server start and database creation 2013-10-16 15:30:13 +02:00
Jan Steemann 3db041598d updated manuals 2013-10-11 17:38:14 +02:00
Jan Steemann 7e3a7825e5 updated Visual Studio projects 2013-10-10 17:54:49 +02:00
Jan Steemann b8318609e2 updated arangorestore 2013-10-10 16:58:21 +02:00
Jan Steemann 6a353a4c38 resolve collection names on reimport 2013-10-10 12:33:27 +02:00
Jan Steemann 294bdda547 better not use ofstream 2013-10-10 09:56:22 +02:00
Jan Steemann 13b51eb849 use batches in arangodump 2013-10-10 09:08:02 +02:00
Jan Steemann af07091d1c Windows fixes 2013-10-09 15:33:38 +02:00
Jan Steemann 0c15f387ae added collection id translation for dumps 2013-10-09 13:46:12 +02:00
Jan Steemann db08da2dc3 added config file for arangodump 2013-10-09 10:12:29 +02:00
Jan Steemann fb08211ac9 fix UTF-8 console output in Windows 2013-10-08 13:12:00 +02:00
Jan Steemann 46a295ba43 fixed some Windows warnings 2013-10-08 12:39:47 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Jan Steemann cf583b061e issue #601 2013-10-01 13:56:31 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann ec3ffa9bca renamed --max-upload-size to --batch-size 2013-09-13 20:25:24 +02:00
Jan Steemann 64741f8a8d added test cases for endpoints 2013-09-13 14:07:30 +02:00
Jan Steemann c6c4c70333 activated arangodump and arangorestore 2013-09-06 00:54:58 +02:00
Jan Steemann 618499c2b1 adjusted client tools and documentation 2013-09-02 14:07:38 +02:00
Jan Steemann 42b8dfca49 added --server.database option for client tools 2013-09-02 13:02:53 +02:00
Jan Steemann 6c64a35895 restore client, unfinished 2013-08-30 01:14:21 +02:00
Jan Steemann 4b36f1422c allow incremental dumping using tick-start and tick-end 2013-08-29 21:47:29 +02:00
Jan Steemann a42be561fd added includeSystem URL parameter 2013-08-29 21:15:47 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann a9f486a0b0 simplified version getting 2013-08-29 11:48:22 +02:00
Jan Steemann 64fda46f62 removed unused variable 2013-08-29 11:47:48 +02:00
Jan Steemann 860ed964c3 simplify build.h 2013-08-28 22:20:06 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann 9b8b030a8a added several tests for authentication 2013-08-22 11:18:11 +02:00
Jan Steemann 94051a74c3 return error code from foxx-manager 2013-07-26 14:58:03 +02:00
Frank Celler 1b6dfad627 new name convention 2013-07-25 17:25:39 +02:00
Jan Steemann 8b6e79dd86 fix VisualStudio error 2013-07-24 16:01:41 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Jan Steemann cdc57aea83 added arango.reconnect() method for arangosh 2013-07-22 09:57:39 +02:00
Jan Steemann 4a4c3d75e4 display username 2013-07-17 11:02:07 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 7543ad0283 removed redundant declaration of HTTP status codes 2013-07-01 12:11:02 +02:00
Jan Steemann c59f00efa8 fixed handling of --temp-path 2013-05-15 15:55:48 +02:00
Frank Celler e98a22a31c added suffix .history to history files 2013-05-10 10:59:53 +02:00
Frank Celler bab92e9c04 fixed help messages 2013-04-21 22:12:58 +02:00
Frank Celler d2ea4e9bd2 added SlowBuffer from node 2013-04-21 21:32:32 +02:00
Frank Celler e10f6bc01d fixed deprecated warnings 2013-04-11 14:16:53 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler cb5427cbce replaced throwing of strings by real objects 2013-04-02 11:27:31 +02:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Frank Celler 44806229f7 fixed jslint errors 2013-03-23 21:57:33 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler 12f0c901e5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into feature/v8cleanup
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	arangosh/V8Client/arangosh.cpp
2013-03-22 14:47:17 +01:00
Frank Celler 891cac01b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/VocBase/collection.c
2013-03-13 17:05:59 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
a-brandt ad90a65c3a deleted 2012 from copyright message 2013-03-13 16:53:06 +01:00
Frank Celler dfd20cd4e2 use TRI_AddGlobalVariableVocbase 2013-03-05 14:49:19 +01:00
Frank Celler a79279445a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-26 18:20:27 +01:00
Jan Steemann ebc653a0bd issue #435 2013-02-26 12:11:13 +01:00
Frank Celler 85d2e87154 added new package option 2013-02-25 18:15:32 +01:00
Frank Celler e5a8843449 added RAW variant 2013-02-22 20:12:27 +01:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann e1da2c45fd added TRI_ShutdownMemory() to free core reserve on clean shutdown 2013-02-20 19:11:33 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Jan Steemann d1f40bc8cf fixed memory zone mismatch in arangosh 2013-02-14 22:24:52 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
a-brandt 2a86dd1935 added "v8::V8::LowMemoryNotification()" before "while (!v8::V8::IdleNotification())" to trigger V8 GC 2013-02-08 15:35:54 +01:00
a-brandt c4dcb8cf25 deleted "ef bb bf" characters 2013-02-04 14:42:31 +01:00
Jan Steemann 32dc7a2db2 fix warning about potentially unintialised variable 2013-01-31 10:43:20 +01:00
Oreste Panaia 0d4852bbe2 windopws icu 2013-01-31 17:32:31 +08:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
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
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
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
Jan Steemann 80373334b3 removed dependency on JsonParserX and Variant*, fixed a small memleak 2012-09-06 16:44:25 +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 39f4a8f833 cleanup directory structure and init file handling
moved common functions to ArangoClient
2012-08-30 16:54:42 +02:00
Frank Celler d26b082ef6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Makefile.in
	UnitTests/Makefile.files
2012-08-24 09:59:16 +02:00
Jan Steemann d602942925 preparation for issue #110: added HTTP patch method 2012-08-20 13:50:24 +02:00
Jan Steemann fc624d464c fixed "reference error: VALGRIND is not defined" 2012-08-20 13:01:55 +02:00
Jan Steemann 0c7021fab7 re-fixed #109: there is no way to reliably detect that a user is referring to some unknown/unloaded collection in arangosh. Therefore reverted the previous fix and simply added a startup notice for the user 2012-08-20 12:53:03 +02:00
Frank Celler 35fa7aee93 fixed subdirectory build 2012-08-19 22:38:16 +02:00
Jan Steemann 3609bad0e7 issue #109: added more user-friendly message if collection used does not exist on client (arangosh) 2012-08-17 13:15:31 +02:00
Jan Steemann b540dc0a45 fixed arangoirb 2012-08-01 11:42:14 +02:00
Jan Steemann 7a0e9d350d added documentation for endpoints, disable-authentication, fixed tests 2012-07-26 09:10:59 +02:00
Jan Steemann da55cda164 changed password behavior 2012-07-25 20:05:45 +02:00
Jan Steemann 435a01b6b3 added authorization for arangosh and arangoimp 2012-07-25 19:49:52 +02:00
Jan Steemann d88bfddb49 added more error handling in arangosh, e.g. for case of 401 errors 2012-07-25 18:48:09 +02:00
Jan Steemann 8d8044ba47 added proper SSL support for arangosh and arangoimp 2012-07-25 17:47:54 +02:00
Jan Steemann ceda8b686a ssl connections 2012-07-25 15:08:17 +02:00
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
2012-07-24 22:56:03 +02:00
Jan Steemann 7ea8cff7c8 some connection refactoring 2012-07-24 18:42:31 +02:00
Jan Steemann a40b1ed511 renamed classes 2012-07-23 15:58:08 +02:00
Jan Steemann dca96749ff default value cleanup 2012-07-23 15:39:52 +02:00
Jan Steemann 4e6c8024f6 added support for unix sockets, switched connection strings to endpoint syntax 2012-07-23 13:54:35 +02:00
Frank Celler 9d9136595e renamed option to javascript.unit-tests 2012-07-15 18:02:22 +02:00
Frank Celler 5ffff9edc4 added process title for supervisor 2012-07-11 10:46:04 +02:00
Jan Steemann 5a74e95f35 allow reusing ids and revision when creating collections and documents 2012-06-19 15:50:52 +02:00
Frank Celler 9d36e4f6e8 fixed relative path 2012-06-13 13:39:21 +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 efcfbccc7a the great rename IV 2012-06-08 15:25:16 +02:00
Frank Celler 313c3c31ed Merge branch '1.0' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangosh/V8Client/arangosh.cpp
2012-06-08 15:13:01 +02:00
Frank Celler d2c758d663 the great rename 2012-06-08 15:01:25 +02:00