1
0
Fork 0
Commit Graph

25115 Commits

Author SHA1 Message Date
Jan Steemann f6592aabff removed unused file 2015-12-22 16:49:39 +01:00
Jan Steemann 06ed7c8413 fix upgrade test 2015-12-22 15:27:49 +01:00
hkernbach f3ac092c9c web ui db view event bugfix 2015-12-22 15:27:12 +01:00
Jan Steemann fb0a522081 fixed compile error 2015-12-22 14:19:32 +01:00
Max Neunhoeffer 989e92761b Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack 2015-12-22 14:18:46 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Max Neunhoeffer 152f3485b3 Fix dump bug in cluster. 2015-12-22 14:18:11 +01:00
Jan Steemann 1b1e42b1b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 14:15:22 +01:00
jsteemann 13fb41c6b0 removed useless flag 2015-12-22 14:15:02 +01:00
Jan Steemann 80c7645146 one more try 2015-12-22 13:10:43 +01:00
Jan Steemann e2e483e06a potential fix 2015-12-22 12:34:48 +01:00
hkernbach 3946ba265d web ui database view tiles event fix 2015-12-22 12:21:55 +01:00
Jan Steemann a3898bd54e fixed test 2015-12-22 11:27:05 +01:00
Jan Steemann dcb8c4f174 prevent segfault 2015-12-22 11:12:16 +01:00
Jan Steemann 55729b78a9 fixed test 2015-12-22 10:44:52 +01:00
hkernbach 55855780dd Merge branch 'backport-exportcache-fix' into devel 2015-12-22 10:20:08 +01:00
Alan Plum cad8c3841a Replace exportCache with app.main.loaded 2015-12-21 19:30:15 +01:00
Alan Plum ff23c28a44 Invalidate export cache when app is reloaded 2015-12-21 19:27:16 +01:00
Jan Steemann 626efd9666 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-21 18:20:59 +01:00
Jan Steemann dac697d24b removed some leftover iostream includes 2015-12-21 18:20:43 +01:00
hkernbach 7053d0d727 grunt build 2015-12-21 18:03:38 +01:00
Jan Steemann e1aa2d939e updated CHANGELOG 2015-12-21 17:02:20 +01:00
Jan Steemann ef27e16a2e updated documentation 2015-12-21 17:00:34 +01:00
Jan Steemann c0d5973adb garbage collection changes 2015-12-21 16:41:54 +01:00
Max Neunhoeffer 61dd94bc27 Merge branch 'devel' into vpack 2015-12-21 16:06:45 +01:00
Max Neunhoeffer ade47c06dc Fix isSorted bug in cluster. 2015-12-21 16:06:04 +01:00
Max Neunhoeffer 61fe51072c Merge branch 'devel' into vpack 2015-12-21 15:22:46 +01:00
Max Neunhoeffer e8e6dc8597 More VPackObjectBuilder usages. 2015-12-21 15:22:19 +01:00
Max Neunhoeffer 3de9b9c47a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-21 15:21:24 +01:00
Max Neunhoeffer 8ce0a484e1 Fix graph traversal tests, behaviour and documentation. 2015-12-21 15:20:56 +01:00
hkernbach 185907c859 web ui database view used wrong id for binding events 2015-12-21 13:33:51 +01:00
Michael Hackstein 58f3a55ea0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-21 13:25:07 +01:00
Michael Hackstein 60df6b70fc Moved traveral tests into the correct suite. This caused the build to fail 2015-12-21 13:25:02 +01:00
hkernbach 374bdde9e4 web ui user management click event fix 2015-12-21 13:22:29 +01:00
hkernbach 10a736ed2a web ui dashboard broken url fix 2015-12-21 13:03:02 +01:00
hkernbach cd24e847c5 webui dashboard css fix 2015-12-21 13:02:54 +01:00
Max Neunhoeffer e0a527eb5d Fix arangodump in cluster. 2015-12-21 11:53:37 +01:00
Max Neunhoeffer b37c8fb5a2 Fix js/common/tests/shell-collection.js in cluster. 2015-12-21 11:05:02 +01:00
jsteemann 20f7125668 updated CHANGELOG 2015-12-21 10:46:48 +01:00
Jan Steemann eb7ed34519 potential fix for _hasActiveExternals 2015-12-21 10:42:12 +01:00
Jan Steemann e3d33f9d16 updated CHANGELOG 2015-12-21 10:40:46 +01:00
Jan Steemann 3e7b42d106 updated CHANGELOG 2015-12-21 10:30:24 +01:00
Jan Steemann 4435a6f392 randomly shuffle V8 contexts 2015-12-21 10:28:56 +01:00
Jan Steemann ba52741a55 adapted compaction status messages 2015-12-21 10:28:52 +01:00
Max Neunhoeffer 4131d38b10 Merge branch 'devel' into vpack 2015-12-21 10:25:26 +01:00
Max Neunhoeffer b8674e5a21 Fix Hebrew fix. 2015-12-21 10:23:54 +01:00
Max Neunhoeffer 3d6223c64c Merge branch 'devel' into vpack 2015-12-21 10:21:41 +01:00
Max Neunhoeffer a26675e28b Turn around the Hebrew "Goodbye" to make it right with most terminals. 2015-12-21 10:18:36 +01:00
Max Neunhoeffer 9d303b69d7 Merge branch 'devel' into vpack 2015-12-21 09:47:42 +01:00
Max Neunhoeffer 0cf659aca2 Allow to set id at collection creation in cluster. 2015-12-21 09:46:50 +01:00