1
0
Fork 0
Commit Graph

10075 Commits

Author SHA1 Message Date
hkernbach fef3e0618d web ui - collections now using async unloading mechanism 2016-02-11 15:21:22 +01:00
hkernbach 711a7a3c4f web ui - collections now using async loading mechanism 2016-02-11 14:27:29 +01:00
Kaveh Vahedipour c69d664989 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-11 13:00:56 +01:00
Kaveh Vahedipour fe9370afb4 Pre merge into devel 2016-02-11 13:00:50 +01:00
Frank Celler 812bfbb5ed added help on empty call 2016-02-11 12:30:31 +01:00
Frank Celler 7b3fc6d09f use information from testresult.json 2016-02-11 12:12:51 +01:00
hkernbach ab31d3f862 web ui - fixed bug where events were not unbound correctly 2016-02-11 11:11:15 +01:00
Max Neunhoeffer fc3f9f2b99 Merge branch 'devel' into ClustUp2 2016-02-11 09:27:28 +01:00
Jan Steemann f59cda9151 jslint 2016-02-11 09:18:45 +01:00
Max Neunhoeffer 465a117864 Merge branch 'devel' into ClustUp2 2016-02-11 09:11:29 +01:00
Max Neunhoeffer 8b98ae5ef5 Snapshot for merging. 2016-02-11 09:11:00 +01:00
Frank Celler f9f935df99 added duration 2016-02-11 08:58:07 +01:00
Frank Celler 251fcb8113 allow more than one test target 2016-02-10 23:21:06 +01:00
jsteemann bee34da616 make replace-or-with-in rule fire in more cases 2016-02-10 23:07:24 +01:00
Jan Steemann c619935874 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-10 16:49:45 +01:00
Jan Steemann 23dfbeee46 optionally restrict logger-follow to a single collection 2016-02-10 16:49:22 +01:00
hkernbach 5e7c78a133 web-ui: added all-option in aql editor 2016-02-10 16:47:12 +01:00
hkernbach 1908d4659b webui work monitor changes 2016-02-10 16:10:48 +01:00
hkernbach 0fe9818807 preparation for work monitor, added some dev test view 2016-02-10 16:01:11 +01:00
Jan Steemann 196ec2593c added parentheses for explain 2016-02-10 15:21:12 +01:00
Jan Steemann 85315ce9db added quantifiers test 2016-02-10 15:20:41 +01:00
Jan Steemann 6094e724e5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-10 14:48:19 +01:00
Jan Steemann fc9a28e4bc remove invalid test 2016-02-10 14:48:13 +01:00
Alan Plum a5dd99d4a7 Fix db._modules based routing 2016-02-10 14:44:21 +01:00
Jan Steemann 0f0154bb54 added test for condition collapsing 2016-02-10 14:30:40 +01:00
Jan Steemann cc257b90ff print brackets in explainer 2016-02-10 13:12:46 +01:00
Jan Steemann 846db2014d Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 12:59:11 +01:00
hkernbach 2f2ecf5595 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-10 12:15:33 +01:00
hkernbach ff26f61668 issue: #1715 2016-02-10 12:15:28 +01:00
Jan Steemann f3107bc25f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-10 11:34:40 +01:00
Jan Steemann 5ba2432d78 remove sort in more cases 2016-02-10 11:23:11 +01:00
Frank Celler 5a44da965a skip non-conn-keep-alive test by default 2016-02-10 09:35:09 +01:00
Max Neunhoeffer 88c2657af7 Merge branch 'devel' into ClustUp2 2016-02-10 08:38:37 +01:00
Kaveh Vahedipour a8e3602f7f Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-09 18:03:51 +01:00
Alan Plum ac18d26c72 Always force when deleting foxxes in aardvark
Fixes #1358.
2016-02-09 17:29:45 +01:00
Kaveh Vahedipour 6fe2dd2465 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-09 16:59:39 +01:00
Alan Plum 950234aaff Recreate missing test from 2.7 2016-02-09 16:50:46 +01:00
Alan Plum 7dbc89d7be Actually register static Foxx model events
Fixes #1665.
2016-02-09 16:50:45 +01:00
hkernbach 6d1efde385 front-end: fixed pagination state bug 2016-02-09 16:41:37 +01:00
Max Neunhoeffer dc63cb3874 Merge branch 'devel' into ClustUp2 2016-02-09 15:52:36 +01:00
hkernbach c94be8d88b scss 2016-02-09 15:28:06 +01:00
hkernbach c9de284769 grunt build 2016-02-09 15:24:44 +01:00
hkernbach 464394703a removed filesize plugin, added pretty bytes 2016-02-09 15:20:03 +01:00
hkernbach 0a6564d61e scss 2016-02-09 14:37:11 +01:00
hkernbach c205e3236a workaround for index modules 2016-02-09 14:26:30 +01:00
hkernbach 4a972d3f55 scss build 2016-02-09 14:21:44 +01:00
hkernbach 4304c26878 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-09 14:17:07 +01:00
Alan Plum ecd99a42a7 Use content-disposition module for all CD headers 2016-02-09 13:54:50 +01:00
Alan Plum afc9185e70 Aardvark downloads now uses prettier zip file names 2016-02-09 13:52:48 +01:00
Jan Steemann c408691e60 make drop never fail 2016-02-09 11:42:21 +01:00
hkernbach 8844e1924e scss lint 2016-02-09 11:07:28 +01:00
Jan Steemann f1b790b92e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-09 10:55:19 +01:00
Jan Steemann 39c3d3d2a2 wait until applier has started 2016-02-09 10:54:37 +01:00
hkernbach c833a82b70 scss 2016-02-09 10:49:44 +01:00
Kaveh Vahedipour 8cb225bd8e Adding JS CMAKE 2016-02-09 10:19:45 +01:00
hkernbach 176bb36b15 front-end: added LIKE filter, issue: #1657 2016-02-09 09:42:12 +01:00
Frank Celler 8a9ac0f372 added duration 2016-02-08 23:38:41 +01:00
hkernbach 33a76762d6 front-end: added NOT IN filter, issue: #1657 2016-02-08 20:30:47 +01:00
hkernbach 82fa26c79e front-end: added IN filter, issue: #1657 2016-02-08 20:20:34 +01:00
hkernbach ae68725a5f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-08 18:20:54 +01:00
hkernbach 690a0516aa fixed issue: #1688 2016-02-08 18:20:48 +01:00
Frank Celler 78970493a8 fixed core path 2016-02-08 16:48:23 +01:00
Jan Steemann f552d61f26 added test 2016-02-08 12:00:21 +01:00
Frank Celler 91f5eda895 fixed result 2016-02-07 19:54:56 +01:00
Jan Steemann 993cf0b0b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-07 19:48:04 +01:00
Jan Steemann 42c4bdbebb ported from 2.8 2016-02-07 19:47:37 +01:00
Frank Celler 59cbebc870 added stress test for killing 2016-02-07 19:35:37 +01:00
Frank Celler a16ca3d77e added recovery 2016-02-07 14:43:33 +01:00
Frank Celler 35408594ed fixed jslint 2016-02-07 14:33:12 +01:00
Frank Celler f85f18bd78 moved tests to testing.js 2016-02-07 13:46:34 +01:00
Frank Celler 4054ddabf5 added http_replication to testing.js 2016-02-07 11:43:46 +01:00
jsteemann 0c9e4bef18 report progress while synchronizing 2016-02-07 00:24:22 +01:00
Frank Celler 546ffce3ed added replication test 2016-02-06 23:30:22 +01:00
Frank Celler 559987a49f moved unittests-dump-authentication to testing.js 2016-02-06 22:50:16 +01:00
Frank Celler 773d639049 moved unittests-dfdb to testing.js 2016-02-06 21:43:57 +01:00
Frank Celler c727d1de6b removed targets covered by testing.js 2016-02-06 20:38:48 +01:00
Frank Celler 6d4b68245a added print.limitString 2016-02-06 20:20:07 +01:00
Frank Celler 025ad2e04c fixed skipAuth comment 2016-02-06 17:09:19 +01:00
jsteemann 37c46024df print progress while synchronizing 2016-02-06 16:54:25 +01:00
jsteemann a5c23fe0fe fix parsing forward ticks, fix line numbers in some error messages 2016-02-06 12:32:14 +01:00
Frank Celler 50b2c499e7 added skipSsl to defaults 2016-02-06 00:56:20 +01:00
Jan Steemann 6aa28abce3 adjusted test 2016-02-05 20:46:57 +01:00
Jan Steemann 040b09f303 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-05 19:47:29 +01:00
Jan Steemann 45f416dae3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:31:17 +01:00
Andreas Streichardt a0df762a42 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-05 18:30:43 +01:00
Frank Celler 4264fae2ab fixed valgrind for testing 2016-02-05 18:22:26 +01:00
Jan Steemann 99b79acb61 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-05 18:20:32 +01:00
Jan Steemann a0cb3b1832 replication changes 2016-02-05 18:06:39 +01:00
Andreas Streichardt 111050871e Fix jslint 2016-02-05 17:23:35 +01:00
Frank Celler ab5b1bb436 fixed external checking im cluster 2016-02-05 14:59:41 +01:00
Andreas Streichardt 8075cdc30f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-05 14:25:45 +01:00
Andreas Streichardt 584c3564c6 Rework unittest cluster start logic 2016-02-05 14:25:17 +01:00
Jan Steemann 071d36c203 replication cleanup 2016-02-05 13:28:38 +01:00
Jan Steemann abd382bf19 replication cleanup 2016-02-05 13:08:12 +01:00
Jan Steemann 60d8fc594e added derived file 2016-02-05 09:37:28 +01:00
Frank Celler e98c8b0758 changed sync to actively wait for result to avoid timeouts 2016-02-04 22:20:35 +01:00
Jan Steemann 94990da5f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-operators 2016-02-04 19:18:43 +01:00
Andreas Streichardt c0ed7f0429 Add peggy 2016-02-04 17:29:08 +01:00
Frank Celler 7769b68d69 fixed returns 2016-02-04 16:46:29 +01:00
Frank Celler 0dff6cfaa1 cleanup 2016-02-04 16:38:35 +01:00