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

22503 Commits

Author SHA1 Message Date
Jan Steemann f0ef3d450f refactoring 2015-08-20 18:25:47 +02:00
Jan Steemann 82f2f07346 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-20 15:32:27 +02:00
Willi Goesgens 6b575c96d9 Add the version into the body of the document, since the header isn't rendered into pdf & ebook. 2015-08-20 14:34:25 +02:00
Jan Steemann f9167b0b69 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-20 12:00:32 +02:00
Jan Steemann 2068136118 updated CHANGELOG 2015-08-20 12:00:25 +02:00
Willi Goesgens 61eb1e6002 Fix vs 2015 compile issue. 2015-08-20 11:34:01 +02:00
Willi Goesgens 7b41912489 Merge pull request #1448 from CoDEmanX/devel 
Fixes for Windows (.sh line endings, ignored files, remove bad file)
 2015-08-20 09:37:31 +02:00
CoDEmanX f35bd8728f Fix target path for js files 
Folder must be omitted from destination path, or a another folder will be created as parent and break file structure.
 2015-08-20 03:23:14 +02:00
Jan Steemann deb7830615 fix dump/restore filenames 2015-08-20 02:47:00 +02:00
Jan Steemann 4b7d04de47 added missing whitespace 2015-08-20 01:46:21 +02:00
Jan Steemann 97d67e4399 use binary-safe string representations 2015-08-20 01:46:20 +02:00
Jan Steemann 1be3733a64 moved some handlers around 
fix disappeared handlers
 2015-08-20 01:26:52 +02:00
Jan Steemann ea382e1f4c removed triagens::rest::Handler 2015-08-20 01:26:50 +02:00
CoDEmanX 622fee5f1a Prevent git from changing line endings from LF to CRLF for shell scripts. 
It would break them over and over again on Windows (strange syntax errors in bash).
 2015-08-19 23:29:55 +02:00
CoDEmanX fcf6576674 Ignore diffs, patches and Windows libs 2015-08-19 23:19:36 +02:00
CoDEmanX 49fcde5872 Fix #1447: remove invalid/empty file 2015-08-19 23:17:25 +02:00
Willi Goesgens f02ecbf3b9 by CoDEmanX: fix windows build for the non-express Visual Studios 2015-08-19 20:56:16 +02:00
Jan Steemann c5f36e6cd5 fixed forward declaration 2015-08-19 17:54:06 +02:00
Jan Steemann 0e3fddf917 fixes for VS2015 2015-08-19 17:18:13 +02:00
Jan Steemann 4e595fda13 simplifications 2015-08-19 17:18:05 +02:00
Jan Steemann f587b2ca6a replication refactoring 2015-08-19 16:13:53 +02:00
Jan Steemann 878641f674 some replication refactoring 2015-08-19 15:32:24 +02:00
Max Neunhoeffer 844e028389 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-08-19 14:46:28 +02:00
Max Neunhoeffer ff135a10ad Add some overrides to silence a clang compiler warning. 2015-08-19 14:46:06 +02:00
Willi Goesgens 18db6faadb by CoDEmanX: fix relative path calculation. 2015-08-19 14:33:28 +02:00
Jan Steemann 90dafd61c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 13:11:52 +02:00
Jan Steemann caeab34b06 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 13:10:12 +02:00
Jan Steemann 56966f7081 fix warning 2015-08-19 13:07:04 +02:00
Jan Steemann f4112fd4d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 13:04:08 +02:00
Willi Goesgens f51f8dde0b by CoDEmanX: fix file permissions before installing 2015-08-19 13:02:13 +02:00
Jan Steemann 6268a20124 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 12:56:51 +02:00
Jan Steemann 3d73af7acf added UPSERT 2015-08-19 12:56:41 +02:00
Jan Steemann e01e874073 don't use void* 2015-08-19 12:56:32 +02:00
Jan Steemann 63f9782fc3 removed unused arango_fe 2015-08-19 12:51:38 +02:00
Jan Steemann d8be947246 fixed unittests-shell-client, which did not start anymore 2015-08-19 12:46:15 +02:00
Jan Steemann 65424143c6 fix VS build 2015-08-19 12:37:34 +02:00
Jan Steemann 28ad41defc fix compile warnings 2015-08-19 12:22:34 +02:00
Jan Steemann e9a598c020 do not include deprecated header 2015-08-19 12:01:12 +02:00
Jan Steemann 6680f3bb5a fix Mac build 2015-08-19 11:56:41 +02:00
Jan Steemann 6076bc632e fixed Makefile 2015-08-19 11:37:51 +02:00
Jan Steemann cb434ea863 added derived file 2015-08-19 11:20:23 +02:00
Jan Steemann 2c640965b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-19 11:19:46 +02:00
Jan Steemann 9f0384284f moved files 2015-08-19 11:19:37 +02:00
Willi Goesgens 9143181f18 Merge pull request #1443 from aurelijusb/cmakeIgnore 
Git ignore for CMAKE generated files
 2015-08-19 10:25:54 +02:00
Willi Goesgens 01a1273a87 Merge pull request #1444 from aurelijusb/documentation 
Small documentation improvements
 2015-08-19 10:23:36 +02:00
Jan Steemann bc7e0f7bbd issue #1445: Object literal simplificatin does not support pseudo-variables NEW and OLD 2015-08-19 09:25:46 +02:00
Jan Steemann c8e7f1a784 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-08-18 18:10:40 +02:00
Jan Steemann edd1e90511 clean up shell implementation code 2015-08-18 18:10:27 +02:00
Jan Steemann 8677da48b1 replication API enhancements, not yet ready 2015-08-18 18:08:20 +02:00
Willi Goesgens 8992b99ec5 add possibility to skip benchmark tests 2015-08-18 17:02:28 +02:00