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

299 Commits

Author SHA1 Message Date
Jan Steemann abd11203c3 fixed version expectation 2014-02-28 10:26:43 +01:00
Jan Steemann 217256ca2e use change from devel branch 2014-02-27 20:11:45 +01:00
Jan Steemann 4de0014ed3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 10:51:20 +01:00
Jan Steemann 1209298476 fixed client tests 2014-02-27 10:49:29 +01:00
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
Jan Steemann b9623ee59f parse configuration files even with --help 2014-02-18 10:21:44 +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
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 83b0cd8e5b fixed segfault 2014-01-30 18:46:34 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +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 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	arangosh/ArangoShell/ArangoClient.cpp
 2013-12-30 17:27:17 +01:00
Frank Celler 9928cd645f added local config 2013-12-30 17:20:39 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 7e30dc0b4e MacOS bundle 2013-12-23 16:03:38 +01:00
Frank Celler da8f9098a2 windows installer 2013-12-23 12:48:35 +01:00
Frank Celler 87cc2c4104 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-21 13:10:15 +01:00
Frank Celler 4f0d9f5b71 install Windows binaries all in bin 2013-12-21 13:10:08 +01:00
Frank Celler 1ef596733d arangosh now uses config file name corresponding to binary name 2013-12-20 23:49:16 +01:00
Frank Celler 2651f7bae5 added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory 2013-12-20 10:39:50 +01:00
Frank Celler f7bf96846b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-19 09:33:02 +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
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Jan Steemann 6ea120ada6 issue #695: arangosh server.password error 
Documentation is fixed
 2013-12-02 13:13:51 +01:00
Jan Steemann 54b5a74530 added shapes test 2013-11-22 02:42:11 +01:00
Jan Steemann adcc26c331 added test case 2013-11-20 23:05:55 +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 914bd38cfc added check-sever 2013-11-20 09:21:22 +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
Frank Celler eee23de5e0 fixed Mac build 
Conflicts:
	Makefile.in
 2013-11-09 13:00:21 +01:00
Frank Celler 3fef8ed585 fixed Mac build 2013-11-09 12:59:24 +01:00