1
0
Fork 0
Commit Graph

10570 Commits

Author SHA1 Message Date
Michael Hackstein 5645d77d22 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 15:40:04 +02:00
Michael Hackstein 4838eba64e Added a large timeout to upgrade database in test case 2016-04-15 15:39:50 +02:00
Max Neunhoeffer a4a8888e54 Sort out cluster test shutdown. 2016-04-15 15:20:28 +02:00
Michael Hackstein 20733a81ae Improved baby errors in cluster 2016-04-15 14:48:44 +02:00
hkernbach a2f57b2ca8 grunt 2016-04-15 13:49:44 +02:00
hkernbach d6d741a27a images, html 2016-04-15 13:48:16 +02:00
Jan Steemann 65e6aed49f jslint 2016-04-15 12:40:14 +02:00
Michael Hackstein 59f7d1ec70 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 08:25:05 +02:00
Max Neunhoeffer e68a60f81f Remove a test that is no longer needed. 2016-04-15 00:39:55 +02:00
Max Neunhoeffer ce150a6539 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-15 00:14:12 +02:00
Max Neunhoeffer cac003a0f4 Take out trace log in testing.js 2016-04-15 00:13:48 +02:00
Max Neunhoeffer 429e59108b Improve situation with tests. 2016-04-15 00:13:37 +02:00
hkernbach cbe91c6df9 scss 2016-04-14 23:49:25 +02:00
hkernbach 0f3997d162 grunt build 2016-04-14 23:44:46 +02:00
hkernbach 8b4f0ed6e8 responsive scss changes 2016-04-14 23:41:24 +02:00
hkernbach c6f82ef3ae new edge api adjustments 2016-04-14 23:41:08 +02:00
hkernbach 06a54b5841 frontend router 2016-04-14 23:14:00 +02:00
hkernbach ff264ea01c scss 2016-04-14 23:13:51 +02:00
hkernbach e27c6d1554 grunt 2016-04-14 22:53:46 +02:00
hkernbach 5b03dfef1e new collection view + subviews 2016-04-14 22:49:39 +02:00
hkernbach bcaadd878f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 21:56:52 +02:00
hkernbach 5c153730d2 view, subviews, scss 2016-04-14 21:56:43 +02:00
Max Neunhoeffer dab12cbeed Take out a debugging message. 2016-04-14 20:20:56 +02:00
Michael Hackstein 2f5910f828 Removed debug output and deactivated TRACE log level during tests 2016-04-14 20:15:26 +02:00
Michael Hackstein 483ca0d5b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 17:42:41 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +02:00
Kaveh Vahedipour f9716fee62 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 16:41:18 +02:00
Kaveh Vahedipour 393b068ac4 store's operator handling 2016-04-14 16:40:25 +02:00
hkernbach 20c80aa35e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:38:47 +02:00
hkernbach b7e6b5dfca jslint frontend 2016-04-14 15:38:39 +02:00
Andreas Streichardt 3160b3cccb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 15:30:34 +02:00
Andreas Streichardt 10461fe369 Fix cluster shutdown time 2016-04-14 15:30:19 +02:00
Kaveh Vahedipour 05db051950 agency test for assigning objects through op set new ttl 2016-04-14 14:34:15 +02:00
hkernbach 128caabd92 scss lint 2016-04-14 13:54:09 +02:00
hkernbach 020c3df628 lib + frontend grunt build 2016-04-14 13:24:18 +02:00
hkernbach 163e58898b Merge remote-tracking branch 'origin/frontendmerge' into devel 2016-04-14 13:08:43 +02:00
hkernbach 526b686cc5 grunt 2016-04-14 13:01:17 +02:00
hkernbach 9d3386cc28 frontend 2016-04-14 13:00:27 +02:00
hkernbach 4ff4729e0f view, scss 2016-04-14 09:43:32 +02:00
Michael Hackstein 4d02abeaa9 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 09:05:56 +02:00
Michael Hackstein 32a5ed5972 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 09:04:34 +02:00
Michael Hackstein bce15b7345 Actually deactivated the agency.wait-for-sync for tests. 2016-04-14 09:04:26 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Andreas Streichardt 0ed24b7465 Merge branch 'agency' into devel 2016-04-13 19:35:30 +02:00
Jan Steemann 576fcab12b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-13 16:29:26 +02:00
Jan Steemann a0fde1b7b2 allow array values in attribute name bind parameters 2016-04-13 16:29:09 +02:00
Michael Hackstein 1352e3d682 Fixed JSLINT 2016-04-13 15:57:49 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
hkernbach b9d1712fb0 scss 2016-04-13 15:12:03 +02:00
Michael Hackstein b043b103e0 Optimized IN in AQL pattern Matcher properly. Also added some tests for it 2016-04-13 14:49:21 +02:00