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

10257 Commits

Author SHA1 Message Date
Frank Celler 5ac3beb02d added sanitizer for longer timeouts 2016-02-20 12:01:31 +01:00
hkernbach 15bc2a96ea scss 2016-02-20 02:11:56 +01:00
hkernbach b502f858b7 rm test file 2016-02-20 02:02:34 +01:00
hkernbach c9ca22c5a5 rm test file 2016-02-20 02:01:05 +01:00
hkernbach 12aace1413 complete grunt build 2016-02-20 01:55:38 +01:00
hkernbach b182f6e48d sync to async calls 2016-02-20 01:52:57 +01:00
hkernbach 553875b691 sync calls to async 2016-02-20 01:20:29 +01:00
hkernbach 09fcdb552d road to fully async web ui 2016-02-19 23:37:19 +01:00
hkernbach e9259f1ae3 removed sync calls from user views 2016-02-19 21:39:51 +01:00
hkernbach e1af85af36 removed sync calls from router 2016-02-19 20:49:50 +01:00
hkernbach adadc04e49 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 20:44:32 +01:00
hkernbach 4f75fa02ac cleanup router 2016-02-19 20:44:04 +01:00
hkernbach 1ce418a7cf added missing logo event 2016-02-19 20:41:51 +01:00
hkernbach e0e4336d53 moved navi elements to the right position 2016-02-19 20:33:18 +01:00
Frank Celler 034eea10b3 fixed version 2016-02-19 20:15:39 +01:00
hkernbach 6525c7762b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 18:58:41 +01:00
hkernbach 2c23eccaad removed async calls 2016-02-19 18:58:34 +01:00
Jan Steemann d44f280651 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-19 18:30:42 +01:00
hkernbach b2df2d6600 replaced sync calls from query view and regarding collection 2016-02-19 18:22:49 +01:00
Jan Steemann bc6283fc91 added WITH collections declarative 2016-02-19 18:20:46 +01:00
hkernbach 15c071f996 replaced some sync calls with async ones 2016-02-19 16:38:54 +01:00
hkernbach 677a8937fa replaced sync call for creating collections with async call 2016-02-19 15:59:56 +01:00
hkernbach 8d2e4f8711 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-19 15:07:56 +01:00
hkernbach 468a3130f6 fixed issue: #1709 2016-02-19 15:07:08 +01:00
Alan Plum 17ef7ca5e9 Revert system app version compatibility 2016-02-19 14:46:31 +01:00
hkernbach 432f2970f6 query management view auto update 2016-02-19 13:56:19 +01:00
hkernbach 89cb11d631 collections model added missing status 2016-02-19 13:03:42 +01:00
hkernbach 53f1ee2c2d grunt build 2016-02-19 12:43:23 +01:00
hkernbach 60299e0b54 progress view 2016-02-19 12:42:56 +01:00
hkernbach 9fe0f9bea3 collection view web ui 2016-02-19 12:13:04 +01:00
hkernbach 4a903a9e6b grunt 2016-02-19 11:31:33 +01:00
hkernbach e8f544c2f0 collections view web ui 2016-02-19 11:31:18 +01:00
Frank Celler 4dbf7be8dc check for location of etc 2016-02-19 10:44:06 +01:00
Kaveh Vahedipour db9d23b7ef Adapting to intel compiler 15.0 2016-02-18 23:26:45 +01:00
hkernbach 415392e747 fixed bug: ##1727 2016-02-18 17:05:21 +01:00
hkernbach fa2e8e03b9 pending jobs call only at colls view 2016-02-18 16:56:14 +01:00
hkernbach e10b3d59d8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-18 16:36:29 +01:00
hkernbach 582d01885e responsive design, scss, readbility numbers, grunt build 2016-02-18 16:36:02 +01:00
Frank Celler 603afe6e5a fixed pathes 2016-02-18 16:30:52 +01:00
Frank Celler 5fcc412f6f switch to 3.0.0 2016-02-18 14:44:57 +01:00
Frank Celler adaef87abf switch to 3.0.0 2016-02-18 14:41:25 +01:00
hkernbach 62a7fb57ec grunt build + jslint 2016-02-17 21:10:26 +01:00
hkernbach 9e776db8ea web ui: some collection tile state changes 2016-02-17 21:06:23 +01:00
hkernbach d4b7cf4c52 removed console log 2016-02-17 20:27:36 +01:00
hkernbach db688dcd46 fixed creation of a graph without definition 2016-02-17 20:23:51 +01:00
hkernbach 307cbdebb9 fixed select2 bug graph management tab 2016-02-17 19:57:15 +01:00
hkernbach 7bb22a3f52 grunt build 2016-02-17 19:47:58 +01:00
hkernbach ec7c8e70f8 scss 2016-02-17 19:41:03 +01:00
hkernbach 34e47326b9 added description to locked collections 2016-02-17 17:50:00 +01:00
hkernbach 2d23cf7e2b web ui, loading documents now cancelable 2016-02-17 17:07:12 +01:00
hkernbach 3b97efd20d removed old indices modal subview 2016-02-17 13:50:26 +01:00
hkernbach 1f73f0611e grunt build 2016-02-17 12:56:05 +01:00
hkernbach 3286e29f9d web ui better handling loading/unloading collections 2016-02-17 12:54:10 +01:00
hkernbach 02d3261a56 webui async creating+deleting indices 2016-02-17 11:59:05 +01:00
hkernbach 80da9faf75 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-16 20:12:43 +01:00
hkernbach 4f821750a4 grunt build 2016-02-16 20:12:36 +01:00
hkernbach 6278621804 improved webui when using big collections 2016-02-16 20:12:20 +01:00
Michael Hackstein 7388345f87 Fixed JSLINT 2016-02-16 15:18:40 +01:00
Michael Hackstein 8295bae5b3 Added generated files 2016-02-16 14:07:10 +01:00
Michael Hackstein 32d0e48d61 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-16 13:56:08 +01:00
hkernbach 948951ebe3 remove index tab when collection not loaded 2016-02-16 09:47:28 +01:00
Alan Plum fb23c44e3d Fix client test 2016-02-16 01:45:57 +01:00
Alan Plum 14cba16385 Linting 2016-02-15 23:29:23 +01:00
Frank Celler 8f1e79e5dc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-15 23:23:44 +01:00
Frank Celler 9a2ced5056 raised waitForSync 2016-02-15 23:22:50 +01:00
Alan Plum 6593f3d358 Clean up stacktraces 
Fixes #1564, #1565, #1744.
 2016-02-15 22:56:29 +01:00
Max Neunhoeffer ed914bb3e6 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-02-15 20:54:20 +01:00
Max Neunhoeffer 0902edc257 Fix jslint error. 2016-02-15 20:50:12 +01:00
hkernbach e42e11d5fc grunt build 2016-02-15 17:13:31 +01:00
hkernbach f170ee0350 web ui: prep for creating and loading collections/documents async, prep for index creation check 2016-02-15 17:13:09 +01:00
Max Neunhoeffer 9d3446afe5 Stop WAL collection before synchronization of shard. 2016-02-15 10:29:06 +01:00
Michael Hackstein a3cd1aa54e Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-15 10:25:31 +01:00
Max Neunhoeffer 459a540867 Merge branch 'devel' into ClustUp2 2016-02-15 09:16:01 +01:00
hkernbach e96fc9c8fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-15 08:53:56 +01:00
hkernbach 35c7daf223 web ui - notification used instead of error, added missing template 2016-02-15 08:53:47 +01:00
Frank Celler 8da0c61de8 fixed jslint 2016-02-14 17:14:00 +01:00
Frank Celler 687f7fdd72 higher wait intervall 2016-02-14 15:34:03 +01:00
Max Neunhoeffer 4cbd99a54b Merge branch 'devel' into ClustUp2 2016-02-13 23:06:22 +01:00
Max Neunhoeffer 1065486a77 First version of getting shards in sync working. 2016-02-13 23:04:20 +01:00
hkernbach 613985443d web ui - moved indices view, added tab bar engine to modals 2016-02-12 16:16:50 +01:00
Jan Steemann 797fff14c2 fixed issue #1722 2016-02-12 09:45:32 +01:00
Alan Plum e228ce0cd0 @arangodb/request: res.body -> res.json 2016-02-11 16:50:07 +01:00
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
Frank Celler 8b6f4b8bec removed DEV_APP_PATH 2016-02-04 16:38:20 +01:00
Max Neunhoeffer fc94a38184 Add an InitDone stamp to cluster plan. 2016-02-04 15:53:42 +01:00
Michael Hackstein edf7f6b9d9 Further implementation of AQL functions for VPack. UNIQUE UNIQUE_SORTED UNION UNION_DISTINCT 2016-02-04 15:23:26 +01:00
Michael Hackstein 84b1f9055d Further implementation of VPackAqlValue functions. This included VALUES and ATTRIBUTES. These functions by accident had an ordering in TRI_json_t which they do not have any more in VelocyPack. Clarified Documentation. 2016-02-04 13:49:59 +01:00
m0ppers 8f96fc3d94 Merge pull request #1704 from m0ppers/initializecluster 
Initializecluster
 2016-02-04 13:43:56 +01:00
Frank Celler ea040037cb unified naming (all_ok, ok => status) 2016-02-04 12:34:31 +01:00
Andreas Streichardt f096580706 Merge remote-tracking branch 'upstream/devel' into initializecluster 2016-02-04 11:37:02 +01:00
Andreas Streichardt adce528373 Proper initialization 
Also find a fitting spot for our role
 2016-02-04 11:29:43 +01:00
Max Neunhoeffer 7a92f3ac0f Merge branch 'devel' into ClustUp2 2016-02-04 09:39:46 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Alan Plum 77b0c9c6bf Add dedent dependency 2016-02-03 16:35:14 +01:00
Alan Plum 28e094702e Restore swagger/index-alt.html 
This is the alternative "inline" version of index.html. Please recreate by diffing against index.html when upgrading Swagger.
Please make sure Swagger is still working in Aardvark after upgrading Swagger.
 2016-02-03 15:10:12 +01:00
Michael Hackstein 0c11b2f759 Use precision to validate numeric result in ABS 2016-02-03 14:51:46 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
Max Neunhoeffer ac51c221b3 Merge branch 'devel' into ClustUp2 2016-02-03 08:55:01 +01:00
jsteemann 13335d4cf9 bugfixes 2016-02-03 01:06:27 +01:00
jsteemann 60d9364e1f added derived files 2016-02-03 00:28:29 +01:00
jsteemann b962c5a9e8 array comparison operators 2016-02-03 00:28:03 +01:00