1
0
Fork 0
Commit Graph

10874 Commits

Author SHA1 Message Date
jsteemann 1f05dbb045 attempt to fix upgrade test 2016-04-22 16:50:18 +02:00
jsteemann 84e53cb40a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 12:37:06 +02:00
jsteemann 366cb659af fixed wrong options 2016-04-22 12:36:58 +02:00
hkernbach 65394e6390 grunt 2016-04-22 12:36:53 +02:00
hkernbach 67420663ed views 2016-04-22 12:33:13 +02:00
hkernbach 5aa9481bd0 templates 2016-04-22 12:32:37 +02:00
hkernbach 81aacb7c52 scss 2016-04-22 12:32:27 +02:00
hkernbach 9c9f18deec graph viewer bugdix, navigation, scss 2016-04-22 09:14:42 +02:00
hkernbach 2c600544d6 grunt build 2016-04-21 18:53:48 +02:00
hkernbach 2ff6aa39b1 frontend images 2016-04-21 18:53:36 +02:00
hkernbach ed50faa950 login view 2016-04-21 18:49:40 +02:00
hkernbach c5ee12019a scss 2016-04-21 16:44:56 +02:00
hkernbach 9ddd8ed0a5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 15:20:24 +02:00
hkernbach abe9880da7 grunt 2016-04-21 15:20:17 +02:00
hkernbach 1d611d0dd2 scss-lint 2016-04-21 15:17:02 +02:00
Alan Plum 7653fe5eb8
Re-createSid on every access
There's no other way to prevent the internal sid from timing out apparently.
2016-04-21 15:14:01 +02:00
hkernbach ae574ee85c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 15:11:39 +02:00
hkernbach 62370bfba8 scss 2016-04-21 15:11:31 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Jan Steemann 5027d7fe1f documentation for LIKE 2016-04-21 12:46:42 +02:00
hkernbach 98d89f6ac3 scss 2016-04-21 12:33:48 +02:00
Kaveh Vahedipour 1acb0cba6f agency/cluster startups seem correct 2016-04-21 11:19:07 +02:00
hkernbach 5917b77cb5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 10:58:24 +02:00
hkernbach 13dc4e3637 footer, grunt config, dygraph config, navbar, dashboard 2016-04-21 10:58:16 +02:00
Alan Plum 996c4568fb
Fix shell-foxx-swager-spec.js 2016-04-21 10:10:11 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections
Excluded Aardvark, the graph viewer in particular
2016-04-20 22:09:00 +02:00
Alan Plum e7e457b560
ES6ify 2016-04-20 18:34:46 +02:00
Alan Plum a3d5c64532
Object.extend is not a function 2016-04-20 18:13:04 +02:00
Alan Plum e4cfa5ec0d
Throw better errors when install fails 2016-04-20 18:11:49 +02:00
Alan Plum 0529471cdc
Allow passing an error to res.throw as reason 2016-04-20 18:11:49 +02:00
hkernbach 05578e8fbf files not needed 2016-04-20 18:11:05 +02:00
hkernbach 8ed6f3bb49 scss cleanup tiles 2016-04-20 18:08:05 +02:00
hkernbach 346363b8b8 fixed tiles 2016-04-20 18:07:52 +02:00
hkernbach 23e21904be grunt 2016-04-20 17:40:28 +02:00
hkernbach 5cde3c698d grunt 2016-04-20 17:34:50 +02:00
hkernbach 5331c317dd grunt build 2016-04-20 17:28:55 +02:00
hkernbach 4d7a1d2b2e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 17:26:54 +02:00
hkernbach e27fa8ae38 new login mechanism, additional frontend changes 2016-04-20 17:26:44 +02:00
Max Neunhoeffer 13fdd67d38 Better timeouts in synchronisation in heartbeat thread. 2016-04-20 17:24:38 +02:00
Max Neunhoeffer e49893cef8 Prepare testing of synchronous replication. 2016-04-20 17:24:19 +02:00
Alan Plum 96aa1d9129
Add req.json 2016-04-20 17:18:51 +02:00
Alan Plum 7065d29975
Don't add default bodies 2016-04-20 17:18:51 +02:00
Alan Plum eea0a0e259
Deduplicate AQL template bindVars and support AQB 2016-04-20 16:18:19 +02:00
hkernbach 972367b4f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 15:48:21 +02:00
hkernbach 5b7f5114f4 cleaned up grunt build 2016-04-20 15:48:11 +02:00
hkernbach fed6c3602c cleanup grunt build process 2016-04-20 15:47:35 +02:00
Alan Plum ac29066808
Make aql global in arangosh 2016-04-20 15:23:05 +02:00
Alan Plum 2f2c7b5c12
Allow switching databases in login 2016-04-20 15:23:04 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00