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

205 Commits

Author SHA1 Message Date
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