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

13025 Commits

Author SHA1 Message Date
Alan Plum 622b4fac4b
JWT uses seconds 
Fixes #2249.
 2017-02-14 19:20:41 +01:00
Alan Plum 7471f94fa7
Linting 2017-02-14 19:20:41 +01:00
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
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 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
jsteemann 107620708c remove now useless decodeURIComponent calls 2017-02-14 11:29:08 +01:00
jsteemann 202bfe1963 Merge branch 'suffix-decoding' of https://github.com/arangodb/arangodb into devel 2017-02-14 11:00:24 +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
Andreas Streichardt e345415879 Allow removing dbservers which are no longer in use 2017-02-13 17:23:39 +01:00
Andreas Streichardt 1b92c8e46b Allow removing dbservers 2017-02-13 17:23:39 +01:00
jsteemann 5a1fe3a341 jslint 2017-02-13 14:35:14 +01:00
Andreas Streichardt 1bb8f97773 Fix secondaries 2017-02-13 14:00:19 +01:00
baslr 4783792684 arangoexport: inital work on test 2017-02-13 12:04:57 +01:00
jsteemann f4f85c16cb Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:48:24 +01:00
jsteemann 8b273b5eaf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-13 08:37:41 +01:00
jsteemann 238070b477 fixed code of some examples 2017-02-13 08:21:28 +01:00
Andreas Streichardt 39436dac89 Finally remove lock methods 2017-02-10 19:47:31 +01:00
Andreas Streichardt cf39ddd39a Fix jslint 2017-02-10 19:43:04 +01:00
Andreas Streichardt 488b71cf54 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-10 19:40:51 +01:00
Andreas Streichardt bc1df86ddd remove lock queries 2017-02-10 19:34:29 +01:00
hkernbach 16be7120aa ui: optimized smart graph creation usability 2017-02-10 17:49:35 +01:00
hkernbach 094904feab changelog 2017-02-10 15:09:38 +01:00
Michael Hackstein d999ebfa87 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-10 12:59:06 +01:00
jsteemann 3c2edd46cd some diagnostics if tasks are not found 2017-02-10 12:27:43 +01:00
jsteemann 24ec05b7ec Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 11:03:17 +01:00
jsteemann dcd218c577 fix typo 2017-02-10 10:53:13 +01:00
jsteemann c314b9fdd3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-10 09:12:28 +01:00
hkernbach 049496ecd9 css 2017-02-10 08:53:28 +01:00
Max Neunhoeffer cf2a47e52c Increase timeout for testServerEmpty. 
Under heavy load 5 min might not be enough.
 2017-02-09 22:14:53 +01:00
Max Neunhoeffer f72af6a06a Increase timeout for waiting for sync repl to settle. 
This is mainly for the case of the parallel unittests, where the heavy
load leads to delays.
 2017-02-09 22:06:39 +01:00
jsteemann 05804be1a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-09 17:53:34 +01:00
jsteemann 8ea56170a9 fix API for big ids 2017-02-09 17:30:07 +01:00
jsteemann b44a6e9010 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-09 16:55:15 +01:00
jsteemann e83d554947 fix index API for big ids 2017-02-09 16:55:09 +01:00
Max Neunhoeffer 273c6328c7 Make testing.js more tolerant at shutdown (for high load). 2017-02-09 16:36:58 +01:00
Frank Celler dc5e946c05 version number is now generated 2017-02-09 16:35:10 +01:00
hkernbach eeb14ab05e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-09 14:01:20 +01:00
hkernbach a635b0ee59 fixed bug in query ui 2017-02-09 14:00:51 +01:00