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

10047 Commits

Author SHA1 Message Date
Michael Hackstein 32d0e48d61 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-16 13:56:08 +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