1
0
Fork 0
Commit Graph

156 Commits

Author SHA1 Message Date
Jan Steemann bbfaee3bfe allow specifying collection name prefixes for `_from` and `_to` in arangoimp: 2016-04-15 16:18:23 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Max Neunhoeffer e77159b008 New returnNew option for insert. 2016-03-11 12:44:36 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 0c2fdb9fb9 less dependency on document-collection.h 2016-03-04 20:53:17 +01:00
Jan Steemann 6eea757c01 simplifications 2016-03-04 19:40:24 +01:00
Jan Steemann 1c150d4d6e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 18:35:40 +01:00
Jan Steemann ad4a9542ea removed file 2016-03-04 18:32:54 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
Max Neunhoeffer 2654e654db Compiles again, document API not yet sorted out. 2016-03-04 10:32:34 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Jan Steemann ebf2d1520b removed TRI_doc_mptr_copy_t 2016-02-26 11:46:33 +01:00
Jan Steemann 3c6391279e cleanup 2016-02-25 12:24:04 +01:00
Jan Steemann 63d1d5339f cppcheck 2016-02-24 17:55:36 +01:00
Jan Steemann eb202f528c pass vocbase in TransactionContext 2016-02-23 13:03:30 +01:00
Jan Steemann f468cd00ad create transaction context as shared ptr 2016-02-23 12:18:39 +01:00
Jan Steemann 0a969caf23 removed SingleCollectionReadOnlyTransaction and SingleCollectionWriteTransaction 2016-02-23 11:05:44 +01:00
Michael Hackstein ed72993cd6 Rest Import Handler now uses new transaction API for truncate as well 2016-02-19 12:51:06 +01:00
Michael Hackstein 2b10ec64d3 Adapted RestImportHandler to new Transaction API 2016-02-17 13:49:10 +01:00
Jan Steemann 0c4ab9054a API cleanup 2016-02-16 15:13:30 +01:00
Jan Steemann 313f27deed renamed methods 2016-02-15 18:18:03 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann 4e94803ad7 honor results of clang-test, clang-tidy and clang-modernize 2016-01-31 15:56:18 +01:00
jsteemann 13481bbebc fix or annotate problems identified by clang-check 2016-01-31 03:32:31 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 8b4b6a1943 moved docu blocks into their own files 2016-01-07 16:03:17 +01:00
Wilfried Goesgens 7fc4b356e4 Revert formattings that break documentation parts. 2016-01-07 15:12:04 +01:00
Wilfried Goesgens 8a0f635dca Wrap examples properly - this was broken during the auto format. 2016-01-07 13:08:50 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann edb4d2dc4c fix some VS compile errors 2016-01-05 14:10:10 +01:00
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 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Jan Steemann e2e483e06a potential fix 2015-12-22 12:34:48 +01:00
jsteemann a058699312 use std::make_shared 2015-12-18 23:34:18 +01:00
jsteemann 19782a45a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-18 23:33:44 +01:00
jsteemann 20ed092d11 added `--create-collection-type` option for arangoimp 2015-12-18 22:26:32 +01:00
Michael Hackstein b543680cca Adapted resthandler to class version of TRI_col_info_t 2015-12-16 11:42:59 +01:00