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

1250 Commits

Author SHA1 Message Date
Frank Celler b5905a293b Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	Documentation/RefManual/Actions.md
	Documentation/UserManual/Foxx.md
	Documentation/UserManual/UserManual.md
	lib/ProgramOptions/program-options.c
 2014-01-25 22:30:04 +01:00
Frank Celler 116873c041 check for null pointer for ROOTDIR 2014-01-25 21:09:16 +01:00
Jan Steemann 587c2aef64 issue #744 
Conflicts:
	lib/ApplicationServer/ApplicationServer.cpp
 2014-01-23 09:58:18 +01:00
Jan Steemann a9b579f1b1 issue #744 2014-01-23 09:47:22 +01:00
Jan Steemann a2e11e606b added graph-specific error code 2014-01-18 01:08:24 +01:00
Jan Steemann c7457ff8f5 updated documentation 2014-01-17 17:10:53 +01:00
Jan Steemann 622edb0fee updated documentation 2014-01-17 17:10:06 +01:00
Jan Steemann d7c3ac13c9 fixed compile warning 2014-01-16 17:17:59 +01:00
Jan Steemann 8ef247eae5 fixed compile warning 2014-01-16 15:05:08 +01:00
Frank Celler f56ac27dc9 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	GNUmakefile
	Makefile.in
	VERSION
	arangod/V8Server/ApplicationV8.cpp
	build.h
	configure
	configure.ac
	js/actions/api-foxx.js
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	lib/BasicsC/locks-win32.c
 2014-01-16 08:53:31 +01:00
Frank Celler c890caf260 fixed typos in windows parts 2014-01-16 08:40:36 +01:00
Jan Steemann 69a6e6449e fixed Doxygen errors 2014-01-15 18:06:07 +01:00
Frank Celler c0bf43d641 added ARANGODB_CONFIG_PATH 2014-01-15 14:27:01 +01:00
Jan Steemann 2cc44ba58e upgraded client version number 2014-01-14 13:27:35 +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 995a3b06da work-around for program-suffix 2013-12-23 18:02:06 +01:00
Frank Celler a3ecc7cd5b fixed wrong type 2013-12-23 16:03:30 +01:00
Frank Celler f5759fa1b6 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-23 12:56:06 +01:00
Frank Celler 0a47caa535 fixed open mode for files 2013-12-23 12:12:13 +01:00
Frank Celler 36f29a573c fixed TRI_Basename 2013-12-22 23:57:42 +01:00
Frank Celler 2f28530bcc wrong prototype, wrong destroy 2013-12-22 15:41:15 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Frank Celler e30725e22d more file path normalisation 2013-12-22 13:27:33 +01:00
Frank Celler 9b49d60b0a fixed concatenate files 2013-12-22 12:45:54 +01:00
Frank Celler 2d5a8eb5ca added service functions 2013-12-22 00:48:31 +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 12fcc9a025 added TRI_LocateInstallDirectory 2013-12-21 13:09:44 +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 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Frank Celler 2651f7bae5 added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory 2013-12-20 10:39:50 +01:00
Frank Celler b2d60817dd added NL and CH 2013-12-19 17:18:29 +01:00
Frank Celler 56a8f0277f use home directory function 2013-12-19 16:32:08 +01:00
Frank Celler b0a43ea575 added move constructor 2013-12-19 16:27:02 +01:00
Frank Celler a82ef8b1ea fixed lock files for Windows 2013-12-19 11:26:38 +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 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics 
Conflicts:
	CHANGELOG
 2013-12-13 16:00:02 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Frank Celler ef7e85053c added missing file 2013-12-07 19:16:38 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Frank Celler f6b40b3395 added memchr and timezone for windows 2013-12-07 18:55:51 +01:00
Jan Steemann d3acf530da re-added stuff that got lost yesterday 2013-12-05 10:26:21 +01:00
Jan Steemann 1306e0e651 committed generated file 2013-12-04 23:10:22 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00
Jan Steemann 52f514b163 fixed doxygen error 2013-12-02 13:16:06 +01:00