1
0
Fork 0
Commit Graph

11217 Commits

Author SHA1 Message Date
hkernbach 2ea71da526 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-19 17:45:07 +02:00
hkernbach a8ef644792 grunt build 2016-05-19 17:44:56 +02:00
hkernbach 4578cd87ec bugfixes 2016-05-19 17:39:13 +02:00
Jan Steemann 70d60e623e simplifications 2016-05-19 17:23:01 +02:00
Jan Steemann e03cff939b jslint 2016-05-19 17:19:05 +02:00
Max Neunhoeffer fc563cfec6 New tests for synch. replication. 2016-05-19 16:53:58 +02:00
Max Neunhoeffer 5760868a32 Fix sync. 2016-05-19 16:53:15 +02:00
hkernbach 45c00ef4f4 frontend bugfix 2016-05-19 16:52:40 +02:00
hkernbach c97a9c0374 login view, removed console log 2016-05-19 16:30:23 +02:00
hkernbach a072367c31 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-19 16:14:28 +02:00
hkernbach 7e2317e151 frontend login mechanism 2016-05-19 16:14:20 +02:00
hkernbach 36bc70a468 aardvark authorization 2016-05-19 16:13:37 +02:00
hkernbach c90d28b3b4 scss 2016-05-19 16:13:19 +02:00
hkernbach 954e1d6b8e cleanup 2016-05-19 16:13:05 +02:00
Jan Steemann b6bde419a4 fix handling of version 0 2016-05-19 15:51:59 +02:00
jsteemann e7f817ffb6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-19 15:24:51 +02:00
jsteemann 2ed62d324a test fix 2016-05-19 15:24:45 +02:00
Max Neunhoeffer aa720cadda Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-19 14:18:59 +02:00
Max Neunhoeffer 8502ea5189 Fix synchronization of shards for sync. replication. 2016-05-19 14:15:27 +02:00
Max Neunhoeffer a73b348e77 Add TRI_SuspendExternalProcess and TRI_ContinueExternalProcess for Unix. 2016-05-19 14:06:57 +02:00
Andreas Streichardt 1f730043c0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-19 11:45:28 +02:00
Andreas Streichardt b689fd7df2 de-sausage frontend 2016-05-19 11:45:14 +02:00
hkernbach 01f70e7ddb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-19 11:21:56 +02:00
hkernbach 4ff3000e51 coordinator view 2016-05-19 11:20:28 +02:00
Simran Brucherseifer d2b65e13ed Add dfdb and foxx-manager to testing.js, fix typo 2016-05-19 10:39:41 +02:00
jsteemann 97c5450e1f optimizations
added C++ implementation for AQL SLICE() function
allow execution of expressions in C++ that contain calculated object elements
do not merge two calculation nodes if they are of different expression types (e.g. simple vs. V8)
added de-duplication of object keys in case the object contains non-unique names
2016-05-19 00:22:35 +02:00
Wilfried Goesgens 9db006b25c Fresh swagger json. 2016-05-18 16:52:17 +02:00
Andreas Streichardt 04caecaeb0 Merge branch 'add-js-server-functions' into devel 2016-05-18 15:36:47 +02:00
Andreas Streichardt 317ffb94c3 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-18 15:36:28 +02:00
Alan Plum ea588e1373
Document sessions middleware 2016-05-18 15:36:00 +02:00
Andreas Streichardt 661c966578 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-18 15:35:11 +02:00
Andreas Streichardt aba66a50eb _listEndpoints => _endpoints() 2016-05-18 15:34:42 +02:00
Jan Steemann 0064e25bc2 jslint 2016-05-18 15:12:31 +02:00
Alan Plum 72e685096a
Foxx console -> legacy 2016-05-18 14:44:47 +02:00
Jan Steemann 1ab2b97209 fix wrong filename in manifest.json 2016-05-18 12:57:23 +02:00
hkernbach cc4e4d911a scss 2016-05-18 11:42:21 +02:00
Jan Steemann c6b883d41d fixed issue #1826 2016-05-18 11:40:58 +02:00
Andreas Streichardt 5e18b2d2e0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-18 10:23:28 +02:00
Andreas Streichardt a3423ace78 Reenable gzip 2016-05-18 10:20:57 +02:00
Simran Brucherseifer 5054706de8 Remove cap constraint leftovers from docs 2016-05-18 04:34:51 +02:00
Andreas Streichardt d695743df2 Add proxy check 2016-05-17 20:23:47 +02:00
Andreas Streichardt 007041e4d3 Fix database selector 2016-05-17 17:20:24 +02:00
Andreas Streichardt 6e26758d15 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-17 17:13:26 +02:00
Andreas Streichardt 89c7c69647 Frontend is now mountable behind a proxy 2016-05-17 17:09:00 +02:00
Max Neunhoeffer 51a2fb6f89 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-17 11:55:15 +02:00
Max Neunhoeffer d45ef395fb Remove test which destroys the cluster. 2016-05-17 11:54:52 +02:00
Jan Steemann d1f9ea3f68 fixed issue #1823 2016-05-17 11:30:23 +02:00
Max Neunhoeffer 57c7bb8ab9 Fix JavaScript collection updater.
Also add tests for synchronous replication.
2016-05-17 11:19:52 +02:00
jsteemann 593052b1e8 removed useless log output 2016-05-13 23:17:53 +02:00
jsteemann 4f72db6451 speed up calls to user-defined functions 2016-05-13 23:08:39 +02:00