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

5520 Commits

Author SHA1 Message Date
Thomas Schmidts d7dc9ea169 Fixed broken examples in the documentation 2015-04-12 13:47:26 +02:00
Alan Plum 966af1a750 Added global/GLOBAL/root to global context. 2015-04-07 16:47:09 +02:00
Jan Steemann 931c26fea3 read .arangod.rc on server start if it exists 2015-04-03 16:00:57 +02:00
Jan Steemann 0e93087d50 slightly faster V8 => JSON conversion in AQL 2015-04-03 16:00:38 +02:00
Jan Steemann 013209b9c7 add expressionType to JSON output of CalculationNode 2015-04-03 15:02:17 +02:00
Jan Steemann 20a4299d0d use nullptr 2015-04-03 14:59:49 +02:00
Jan Steemann 37e0233d10 Revert "added missing files for JSH" 
This reverts commit 99b80dd1e338ec122fea54e6af604f2310f1e080.
 2015-04-03 14:57:52 +02:00
Jan Steemann 8b132ad60f added missing files for JSH 2015-04-03 14:57:12 +02:00
Jan Steemann de877150eb less branching in comparison functions 2015-04-03 13:49:33 +02:00
Jan Steemann 92c8dc9429 fixed documentation 
Conflicts:
	Documentation/Scripts/generateSwaggerApi.py
 2015-04-03 13:22:44 +02:00
Jan Steemann 0f1244f72d better export API cleanup 2015-03-31 18:44:51 +02:00
Jan Steemann ca6801d473 Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring 2015-03-31 15:13:41 +02:00
Jan Steemann 6dfb4d4b09 Merge branch 'devel' of https://github.com/arangodb/arangodb into cursor-refactoring 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	lib/HttpServer/HttpHandler.cpp
	lib/HttpServer/HttpServerJob.h
 2015-03-31 15:13:31 +02:00
Jan Steemann 9706a3d6ac fixed Windows compile errors 2015-03-31 15:12:38 +02:00
Jan Steemann 3f913f96d7 less copying of RangeInfoBounds 2015-03-31 14:53:14 +02:00
Jan Steemann 6f4fadd630 removed .o files 2015-03-31 14:45:22 +02:00
Frank Celler ffbc45d2e2 new HttpServer & HttpCommTask 
Conflicts:
	Makefile.in
	arangod/Aql/RestAqlHandler.cpp
	arangod/Aql/grammar.cpp
	arangod/Cluster/RestShardHandler.cpp
	lib/GeneralServer/GeneralServer.h
	lib/GeneralServer/GeneralServerDispatcher.h
	lib/HttpServer/HttpServerJob.h
	lib/HttpServer/HttpsCommTask.h
	lib/SimpleHttpClient/SslClientConnection.cpp
 2015-03-31 09:12:01 +02:00
Jan Steemann c508eb0a81 removed some debugging features 2015-03-30 22:05:31 +02:00
Jan Steemann 925f4fbab6 cleanup of some static const variables 2015-03-30 21:43:55 +02:00
Jan Steemann e672d791b5 refactored cursor API, added export API 2015-03-30 18:03:42 +02:00
Jan Steemann 80a99ab23e refactored cursor API 2015-03-30 14:58:51 +02:00
Jan Steemann 3ddf23d093 hand-moved changes from other branch 2015-03-30 12:30:45 +02:00
Jan Steemann 3ac535bb69 fixed startup 2015-03-27 18:33:05 +01:00
Jan Steemann 3057cf7a74 added edge index iterator 
Conflicts:
	arangod/Aql/ExecutionBlock.h
 2015-03-27 17:24:47 +01:00
Jan Steemann 50b531666c optimization for AQL CONCAT() 
Conflicts:
	arangod/Aql/AqlValue.cpp
	arangod/Aql/AqlValue.h
	arangod/Aql/Ast.cpp
 2015-03-27 17:18:27 +01:00
Jan Steemann 9c3419fda3 fixed extern type 2015-03-27 17:09:17 +01:00
Jan Steemann 6957de23d2 fixed name qualification 2015-03-27 17:06:58 +01:00
Jan Steemann 960b464c57 issue #1054: add info whether server is running in service or user mode? 2015-03-27 16:49:47 +01:00
Jan Steemann 5599259075 fixed Visual Studio compile errors 2015-03-26 10:34:38 +01:00
Jan Steemann c352ba6a03 small logging refactoring 2015-03-26 03:09:07 +01:00
Jan Steemann 3555cdb0fe removed unused method 2015-03-25 17:00:47 +01:00
Jan Steemann e230ac11c0 fixed leak 2015-03-25 16:55:45 +01:00
Jan Steemann 9703f04621 fixed wrong return value 2015-03-25 13:03:49 +01:00
Jan Steemann 2f58e4ea61 small cleanup 2015-03-25 12:42:44 +01:00
Jan Steemann 59053df10a issue #1285: allow bind parameter names starting with underscores 2015-03-24 18:43:53 +01:00
Jan Steemann b98f8f7e29 fix initialization 2015-03-24 18:42:24 +01:00
Jan Steemann 0ceff3f1b0 added cluster tests 2015-03-24 18:28:55 +01:00
Jan Steemann 01745402f3 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-24 14:34:20 +01:00
Jan Steemann a3c0612798 added cluster tests 2015-03-24 14:34:09 +01:00
Willi Goesgens 44101c621d Fix macos warning: declaring & calling in one line seems to be undeclared. 2015-03-24 11:33:19 +01:00
Jan Steemann 66e2273482 added documentation for UPSERT 2015-03-24 00:44:52 +01:00
Jan Steemann cbee2c6466 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-23 22:28:58 +01:00
Jan Steemann 7d5cc17d98 added tests 2015-03-23 22:28:26 +01:00
Willi Goesgens 486d86e0cb add new file from a1af44bf4900600f54d4b8dc233429df488633db to CMake too. 2015-03-23 17:47:34 +01:00
Jan Steemann ac44597788 removed unused files 2015-03-23 15:46:31 +01:00
Jan Steemann c62c26e088 Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-23 15:31:41 +01:00
Jan Steemann e3bf1c709c upsert blocks 2015-03-23 15:31:07 +01:00
Frank Celler 4c5d57f1b8 merged Exceptions.h and Exception.h 2015-03-23 14:05:19 +01:00
Frank Celler 3c52dcde6d changed _api/query to C++ 
Conflicts:
	CHANGELOG
	Makefile.in
	README
	arangod/RestServer/ArangoServer.cpp
 2015-03-23 10:51:14 +01:00
Jan Steemann 3b6dfc868e Merge branch 'devel' of https://github.com/arangodb/arangodb into data-modification 2015-03-20 23:23:13 +01:00