1
0
Fork 0
Commit Graph

36718 Commits

Author SHA1 Message Date
Alan Plum 5a02a8983f
More cookie options
Fixes #2085.
2017-02-14 19:20:40 +01:00
Frank Celler 511e907c58 fixed missing semicolon 2017-02-14 18:20:34 +01:00
hkernbach cf636b6970 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-14 18:06:43 +01:00
hkernbach 1a5112da79 optimized graph management view 2017-02-14 18:06:29 +01:00
Alan Plum 022ff11886
REALLY fix routing tests 2017-02-14 17:18:40 +01:00
Alan Plum 01f83c20a2
Really fix routing 2017-02-14 17:15:44 +01:00
Alan Plum d72be1cf74
Fix routing 2017-02-14 17:15:06 +01:00
Wilfried Goesgens e10dca6417 allow to specify the directory for the windows client build 2017-02-14 17:07:59 +01:00
Alan Plum 0f4b932717
Fix Foxx routing 2017-02-14 16:36:40 +01:00
Alan Plum d72f3ea511
Define Foxx's expected routing behaviour 2017-02-14 16:36:40 +01:00
Alan Plum 2eb8f30c7f
Spring cleaning
Also removed actions.rewriteRouting as it is not actually used anywhere.
2017-02-14 16:36:40 +01:00
jsteemann 8c9dd79aeb potential fixes for MSVC 2017-02-14 16:11:18 +01:00
jsteemann 1b5445731b potential fixes for MSVC 2017-02-14 16:01:00 +01:00
Kaveh Vahedipour 37472ddcdc revisited the appendEntries API 2017-02-14 15:18:07 +01:00
Kaveh Vahedipour b6756bad65 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 15:08:03 +01:00
Kaveh Vahedipour 05250b6c7b back port of bug fixes in 3.1 2017-02-14 15:07:51 +01:00
jsteemann 8a2e353f3d move encoding functions into their own file 2017-02-14 12:57:15 +01:00
jsteemann be77decb2d remove an unused include 2017-02-14 12:39:50 +01:00
jsteemann cbe8ee1172 renamed feature 2017-02-14 12:35:54 +01:00
jsteemann 80be198a39 moved helper classes into their own file 2017-02-14 12:35:34 +01:00
jsteemann 8e912ef4dc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 12:08:16 +01:00
jsteemann c5fc5d3fe8 added assertions 2017-02-14 12:01:52 +01:00
jsteemann 2cebe3de66 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 12:01:36 +01:00
hkernbach b40c33bfbd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-14 11:47:51 +01:00
hkernbach bf9250fdb1 grunt 2017-02-14 11:47:38 +01:00
hkernbach 559b8d371d fixed memory issue within ui dashboard 2017-02-14 11:44:37 +01:00
Michael Hackstein 6605a01410 Moved lookupDocument form LogicalCollection into MMFilesCollection. It is SE specific. 2017-02-14 11:37:45 +01:00
jsteemann 9ede671aa3 pre-reserve array 2017-02-14 11:34:34 +01:00
jsteemann 107620708c remove now useless decodeURIComponent calls 2017-02-14 11:29:08 +01:00
jsteemann ff956f1696 expose rawSuffix 2017-02-14 11:25:12 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +01:00
Michael Hackstein 32bd15d098 Renamed collection->update() to update the properties of a collection to collection->updateProperties(). There is another update() which is used for the stored Documents. 2017-02-14 10:32:24 +01:00
Michael Hackstein c8757efc8e Moved engine specific logic of Document Remove from Logical To Physical Collection 2017-02-14 10:20:32 +01:00
jsteemann a6d6bfe71a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-14 09:15:31 +01:00
jsteemann b55cf1b12a make smartGraphAttribute optional 2017-02-14 09:15:12 +01:00
jsteemann b666254d4b make constructor explicit 2017-02-14 08:59:05 +01:00
jsteemann 1ee91ae828 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-14 08:45:14 +01:00
Wilfried Goesgens 756fca0807 follow subrepo 2017-02-13 22:08:41 +01:00
Wilfried Goesgens 884844ee30 fight git submodules 2017-02-13 21:35:39 +01:00
Wilfried Goesgens a12e02cdd2 fix gitmodules file 2017-02-13 20:56:30 +01:00
Wilfried Goesgens 2cb3169c54 Revert "unfuck windows by copying the gtest header into the V8 target directory" it didn't work - we now have a matching git repo for this lonely header.
This reverts commit 6777a4143b.
2017-02-13 20:40:43 +01:00
Wilfried Goesgens 31730ed86c move forward - no more symlinks for the wintendo 2017-02-13 20:40:25 +01:00
Wilfried Goesgens dc05a9bc57 remove windows workaround - we can do without now. 2017-02-13 20:09:09 +01:00
Wilfried Goesgens 6777a4143b unfuck windows by copying the gtest header into the V8 target directory 2017-02-13 20:07:36 +01:00
Wilfried Goesgens 7613ba780f unfuck windows workingcopy from faulty jenkins git checkouts 2017-02-13 18:37:01 +01:00
Michael Hackstein 03e77aee4a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-13 17:58:56 +01:00
Michael Hackstein 2824c349bb Moved EngineSpecific logic of update() from LogicalCollection to MMFilesCollection. 2017-02-13 17:45:33 +01:00
jsteemann bf46ef91ff Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 17:28:21 +01:00
jsteemann 9efc1c7b61 moved transaction status into its own file 2017-02-13 17:28:02 +01:00
Kaveh Vahedipour c595b709d9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-13 17:25:12 +01:00