1
0
Fork 0
Commit Graph

632 Commits

Author SHA1 Message Date
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Jan Steemann ca95afef2c fixed undefined behavior 2015-12-17 16:09:54 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
jsteemann 1e98af01ba set cloexec for file descriptors 2015-12-15 20:30:28 +01:00
Jan Steemann 2bdbb13e2c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 14:13:36 +01:00
jsteemann 18e47457a6 fixes 2015-12-11 13:29:18 +01:00
Michael Hackstein 02784df7f8 Updated file list function to use std::vector<std::string> instead of TRI_string_vector_t. 2015-12-08 15:10:03 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Jan Steemann cf7fa63a53 issue #1036: allow aborting waiting HTTP requests from the ArangoShell 2015-12-03 18:55:51 +01:00
Jan Steemann 931e3f93ae issue #1036: implement CTRL-C handling in ArangoShell for Windows 2015-12-03 16:25:19 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann eb8899d9ae applied changes suggested by cppcheck 2015-12-02 10:17:14 +01:00
Jan Steemann a66368e10c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-11-26 17:13:33 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Jan Steemann 389c3e0cf0 small optimizations 2015-11-26 16:31:25 +01:00
Jan Steemann 9ef5b4746a removed several includes from Common.h 2015-11-25 12:21:55 +01:00
Jan Steemann 5518244942 less iostream-ing 2015-11-24 13:55:06 +01:00
Jan Steemann 89e0f887b9 velocypack update 2015-11-19 13:28:40 +01:00
jsteemann f5e71197ce document creation 2015-11-17 01:46:58 +01:00
Jan Steemann b0ea7dd562 added V8ToVPack conversion 2015-11-13 17:27:35 +01:00
Jan Steemann e7be8952bb updated vpack library 2015-11-09 15:26:12 +01:00
Michael Hackstein 298d00908c Added an implementation to transform a VelocyPack into a V8::Handle<V8::Value> 2015-11-08 15:00:13 +01:00
Wilfried Goesgens 7a54982eb4 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-06 13:53:21 +01:00
Jan Steemann 3c04642550 moved object cache from `db` object into object of its own 2015-11-05 14:20:02 +01:00
Wilfried Goesgens 179660e87c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-04 17:07:09 +01:00
Frank Celler 3500e569a8 reverted 011117edee, 72c8847324, 5da5715fa9, a371aac4af, 7decf1560a, 0331ff7993, 6ec2014052, ae8d686ae6, 7efd0a1ec7, 3449b87e2c, d35a4034ef, 7b3c1ed4dd, e0c88e4a1a, 952d643101, fc9de8ed08, 2f4319b31a, 105662d5ba, 0a08833b0f, 4ac19a99fc, 4c5494c67d, 528bb85b30, 528bb85b30 becuase of missing CLA 2015-11-03 10:19:25 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
2015-10-28 11:08:18 +01:00
Frank Celler 4b99be0c30 added --enable-console to configure 2015-10-25 19:59:16 +01:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann 3f622d71fb fixed some require issues 2015-10-05 10:28:44 +02:00
Jan Steemann 0ea2247eb0 scan-build 2015-09-30 17:28:52 +02:00
Jan Steemann 99f244774d fixed --javascript.execute 2015-09-25 13:58:04 +02:00
Michael Hackstein 1a7f414c16 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-09-18 12:21:39 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Jan Steemann a9d63a0612 do not advertise support for delate encoding in `org/arangodb/request` by default 2015-08-29 02:46:01 +02:00
Jan Steemann a253a5d320 do not halt on single-line comments 2015-08-28 16:41:14 +02:00
Jan Steemann 5bf32095a1 print abortion 2015-08-26 12:02:43 +02:00
Jan Steemann 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Jan Steemann edd1e90511 clean up shell implementation code 2015-08-18 18:10:27 +02:00
Jan Steemann dd378089bc close connection on I/O errors 2015-08-14 14:59:32 +02:00
Jan Steemann bdee652547 fixed V8 crash "Escape value set twice" 2015-08-12 23:39:59 +02:00
Jan Steemann e62974240b allow termination of current shell command 2015-08-12 21:39:16 +02:00
Frank Celler 4a9d775061 cleanup 2015-08-12 17:54:15 +02:00
Frank Celler 9de6bd39db moved to strings, fixed #1432: arangosh doesn't ignore prefixed ....> on paste 2015-08-12 17:54:14 +02:00
Frank Celler 3029891405 added better readline support for control-C 2015-08-11 12:05:55 +02:00