1
0
Fork 0
Commit Graph

28780 Commits

Author SHA1 Message Date
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
jsteemann 87c79ca41c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 22:03:32 +02:00
jsteemann ad062b0566 turn off trace-level logging 2016-04-14 22:03:21 +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
Jan Steemann bccbfc8042 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 20:57:31 +02:00
Jan Steemann 46e5150272 micro optimizations 2016-04-14 20:57:24 +02:00
Michael Hackstein eee02b40cb Use proper URL encoding in Cluster Documents API (single case) 2016-04-14 20:26:11 +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 8989c9e31c Fixed condition checking in SingleDocument Read Cluster case 2016-04-14 20:13:59 +02:00
Michael Hackstein 8c7023850e Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 19:37:28 +02:00
Andreas Streichardt 49d0407859 Trace vs info again 2016-04-14 18:23:08 +02:00
Andreas Streichardt 23af9480f6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 18:18:16 +02:00
Andreas Streichardt 612c387c56 Optimize version increase stuff 2016-04-14 18:17:25 +02:00
Wilfried Goesgens 177d159282 get some inspiration from https://github.com/sleepycat/arangodb-git_arch/blob/master/arangodb.service 2016-04-14 18:11:14 +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 4411bb390b REmoved dead code 2016-04-14 17:41:25 +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 333d53e733 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:29:46 +02:00
Kaveh Vahedipour 2dcf897797 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 17:27:17 +02:00
Kaveh Vahedipour db4b527df5 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:27:06 +02:00
Kaveh Vahedipour 67c06047f3 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:17:37 +02:00
Max Neunhoeffer c71788ef32 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 16:51:01 +02:00
Max Neunhoeffer bd1fd8fc3d Fix AgencyComm::getValues. 2016-04-14 16:50:46 +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 7a8f101cfc Merge branch 'devel' into agency 2016-04-14 15:31:14 +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 544b8df334 signle instance agency doesn't need to utilize thread in Agent 2016-04-14 14:57:39 +02:00
Kaveh Vahedipour 05db051950 agency test for assigning objects through op set new ttl 2016-04-14 14:34:15 +02:00
Kaveh Vahedipour 220132f5e7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-14 14:05:05 +02:00
Kaveh Vahedipour 01ec96f859 correct handling of objects in agency op set 2016-04-14 14:03:42 +02:00
hkernbach 7f15bba720 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 13:54:18 +02:00
hkernbach 128caabd92 scss lint 2016-04-14 13:54:09 +02:00
Wilfried Goesgens 924fae53f9 Autodetect a nuget installation of openssl in the users windows home directory 2016-04-14 13:40:17 +02:00
Wilfried Goesgens e173d26aa9 remove directory mangling for our old windows special library directory mechanism 2016-04-14 13:38:52 +02:00
Michael Hackstein e90193bec0 Fixed a nullptr access in Traversal condition finder. 2016-04-14 13:32:28 +02:00
Max Neunhoeffer 79d709a01c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 13:30:23 +02:00
Max Neunhoeffer 87197cd843 Fix lock() in AgencyComm. 2016-04-14 13:30:07 +02:00