Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
31,135 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

11617 Commits

Author SHA1 Message Date
Kaveh Vahedipour b93981df61 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-03 13:32:24 +02:00
Kaveh Vahedipour 2821d3ab86 jslint error 2016-06-03 13:32:15 +02:00
Jan Steemann 6e90e5f877 jslint 2016-06-03 13:00:21 +02:00
Jan Steemann 6e26e748ca jslint 2016-06-03 12:59:38 +02:00
Jan Steemann 5925b3a077 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-03 12:56:42 +02:00
hkernbach 4e4324081f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-03 12:28:42 +02:00
hkernbach 6df0043b9b collection edit view rename bugfix [ci skip] 2016-06-03 12:28:34 +02:00
hkernbach 5f9cd03600 foxx url bugfix [ci skip] 2016-06-03 12:28:09 +02:00
hkernbach 4c6c896bdb focus query editor after submitting a query 2016-06-03 12:27:40 +02:00
Kaveh Vahedipour 427453bcc7 server health for aardvark 2016-06-03 12:19:39 +02:00
Jan Steemann 38dbbfdf9d changed division by zero result 2016-06-03 11:50:45 +02:00
Andreas Streichardt 78b5bc1bbb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-03 11:19:58 +02:00
Andreas Streichardt 9d03f85e9b Fix dump authentication test 2016-06-03 11:19:42 +02:00
hkernbach 9cd5eae781 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-03 10:57:58 +02:00
hkernbach ee5ac0a709 responsive query view 2016-06-03 10:57:51 +02:00
hkernbach 55a7883277 scss 2016-06-03 10:57:37 +02:00
hkernbach 449714aa54 login bugfix 2016-06-03 10:57:28 +02:00
Jan Steemann 5c0dd05308 added PI() function 2016-06-03 09:25:46 +02:00
hkernbach 05025e5e7f dashboard view loading view fix 2016-06-03 08:56:36 +02:00
Andreas Streichardt 54de1a5e52 fix jslint 2016-06-02 19:55:05 +02:00
Andreas Streichardt a1f9b94bce Remove session stuff 2016-06-02 17:56:26 +02:00
Kaveh Vahedipour 8c882c6b3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-02 17:22:17 +02:00
Kaveh Vahedipour 6f62f5baa3 checking before range loops for emptyness 2016-06-02 17:22:12 +02:00
Andreas Streichardt 1534f2f123 add grants 2016-06-02 16:39:57 +02:00
Andreas Streichardt cdb04e42e4 Merge remote-tracking branch 'origin/FMH' into jwt 2016-06-02 16:29:38 +02:00
Andreas Streichardt a3d5ce8d16 Merge remote-tracking branch 'origin' into jwt 2016-06-02 14:45:21 +02:00
Frank Celler 572e2524fa added config 2016-06-02 12:52:35 +02:00
Jan Steemann 268c349dee added new AQL functions for syntax highlighting 2016-06-02 12:04:30 +02:00
Frank Celler 8c9055f3fd Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-02 11:13:23 +02:00
Frank Celler c57ba92de3 fixed access 2016-06-02 11:12:35 +02:00
Jan Steemann b2c000ab8b added tests 2016-06-02 10:24:40 +02:00
jsteemann 222c57ed32 renamed "rocksdb" index to "persistent" index 2016-06-02 10:23:30 +02:00
Frank Celler 397623460e WIP 2016-06-02 09:49:36 +02:00
Frank Celler 22b454800d WIP 2016-06-01 23:03:00 +02:00
Frank Celler 70db2ede15 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-01 17:59:29 +02:00
Andreas Streichardt 74719c76a6 Merge branch 'devel' into jwt 2016-06-01 17:59:10 +02:00
Andreas Streichardt b00322b2e1 Classic 2016-06-01 17:54:14 +02:00
Andreas Streichardt 021b71a7c1 Frontend is working 2016-06-01 17:51:39 +02:00
Frank Celler 783eddd91a added grant database and revoke database 2016-06-01 17:46:13 +02:00
Jan Steemann 2003d507a8 added tests 2016-06-01 17:29:17 +02:00
Frank Celler 0954dbf2d5 Merge branch 'FMH' of https://github.com/arangodb/arangodb into FMH 2016-06-01 17:15:00 +02:00
Frank Celler 80df233daa WIP 2016-06-01 17:14:29 +02:00
Frank Celler 6f09122da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-06-01 16:25:21 +02:00
Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Cluster/HeartbeatThread.cpp
	arangod/RestServer/RestServerFeature.cpp
 2016-06-01 16:25:13 +02:00
Jan Steemann e82ed380e6 added tests 2016-06-01 16:23:12 +02:00
jsteemann 21d0be76e6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-01 15:06:44 +02:00
jsteemann 7bb5675031 set log level to debug 2016-06-01 15:06:34 +02:00
Wilfried Goesgens eae752786f Windows: also need to check for FN.exe 2016-06-01 15:05:24 +02:00
Wilfried Goesgens 13255937ca Check for files to actually exist before we execute them. 2016-06-01 13:55:07 +02:00
Frank Celler 963449d5f7 WIP 2016-06-01 13:37:13 +02:00
Jan Steemann e2ec68c001 added tests for AQL functions 2016-06-01 13:32:08 +02:00
Andreas Streichardt ba14069f93 Merge branch 'devel' into jwt 2016-06-01 12:10:12 +02:00
Andreas Streichardt 1fb57a2a93 properly check for failures 2016-06-01 12:08:44 +02:00
Andreas Streichardt 630d12713d Merge branch 'devel' into jwt 2016-06-01 10:19:53 +02:00
Andreas Streichardt 979e0f2d07 proper expiry 2016-06-01 09:59:24 +02:00
Andreas Streichardt 2a1c9b93f4 Fix eslint stuff 2016-06-01 09:50:32 +02:00
Simran Brucherseifer a3af3ed44a Adjust and extend tests for CONCAT*() 2016-06-01 02:57:31 +02:00
Simran Brucherseifer f718a8995a Add ATAN2() function to AQL 2016-06-01 02:57:31 +02:00
Max Neunhoeffer 778bb0685b New swagger output. 2016-05-31 18:11:32 -06:00
Max Neunhoeffer 2e0d832d89 More resilience tests. 2016-05-31 13:49:26 -06:00
Max Neunhoeffer 64be77551f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-31 12:41:48 -06:00
Max Neunhoeffer 436e1a52ed Handle extraArgs correctly, start supervision in agency in tests. 2016-05-31 12:39:45 -06:00
Andreas Streichardt a6a6f162fa Fix hardcoded jwt 2016-05-31 19:26:38 +02:00
Andreas Streichardt 9178e560eb Implement jwt tests 2016-05-31 19:19:10 +02:00
Wilfried Goesgens ec270af71d Fresh swagger 2016-05-31 19:13:01 +02:00
Max Neunhoeffer 52e2f8cb01 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-31 10:38:06 -06:00
Max Neunhoeffer 0deed878ba Start statistics tasks only with a delay. 2016-05-31 10:36:01 -06:00
Jan Steemann d7cfba3527 added (experimental) REGEX function 2016-05-31 17:59:35 +02:00
Jan Steemann ea804aa4b3 updated generated files 2016-05-31 16:32:43 +02:00
Kaveh Vahedipour 7b440f94dc Moving Job classes out of Supervision 2016-05-31 16:28:54 +02:00
Alan Plum 577c59581a
Rebuild aardvark 2016-05-31 14:46:00 +02:00
Alan Plum d4a9b0e1f3
Indicate legacy state in app store 2016-05-31 14:46:00 +02:00
Alan Plum 5bdfcc5f88
Port 0ef698a and 1f17514 to 3.0 2016-05-31 14:45:59 +02:00
Alan Plum 76be53e57c
Don't throw generic errors in Foxx manager 2016-05-31 14:45:59 +02:00
jsteemann f6a559114d re-added secondary signature for CONCAT() 2016-05-31 14:31:03 +02:00
Alan Plum 04b3076437
English mf, do you speak it? 2016-05-31 12:55:05 +02:00
Alan Plum 63ccfa22a9
request.params -> request.param 2016-05-31 12:55:04 +02:00
Alan Plum 94462c90c0
Fall back to Infinity for request.range max value 2016-05-31 12:55:04 +02:00
jsteemann 75607c0f6d added some (yet experimental) trig functions 2016-05-31 11:08:50 +02:00
Jan Steemann 154eb49ad5 added test for deadlock detection 2016-05-31 10:19:45 +02:00
Jan Steemann 0b17568365 fix jslint 2016-05-31 10:17:05 +02:00
Max Neunhoeffer 1538bb7cb0 Bugfix for sync. repl. 2016-05-31 01:18:05 -06:00
Max Neunhoeffer 6e984b8411 Test code for sync. replication. 2016-05-31 01:14:02 -06:00
Wilfried Goesgens 1c992add06 Fresh examples. 2016-05-30 12:42:28 +02:00
Wilfried Goesgens b664778da1 fix allready 2016-05-30 09:46:33 +02:00
Jan Steemann 10c64f319f fix husten 2016-05-27 09:45:17 +02:00
hkernbach fba107e98e grunt build 2016-05-26 14:11:01 +02:00
hkernbach 318e8a3de2 removed console log [ci skip] 2016-05-26 14:03:05 +02:00
hkernbach 7b638a60d8 login view [ci skip] 2016-05-26 14:02:27 +02:00
hkernbach 63f3689725 scss [ci skip] 2016-05-26 12:40:49 +02:00
hkernbach 1282c55cbd scale view 2016-05-26 12:28:06 +02:00
hkernbach 009a02d402 added scale function 2016-05-26 12:27:42 +02:00
hkernbach 1871ca9533 scss [ci skip] 2016-05-26 12:26:05 +02:00
hkernbach da60e89703 cluster offline view - part 2 [ci skip] 2016-05-26 08:33:27 +02:00
hkernbach 205c75f1d4 cluster offline view [ci skip] 2016-05-26 08:17:32 +02:00
Max Neunhoeffer d6b9643a8e Temporarily use replicationFactor 1 for system collections. 
This is to avoid bugs which are still in the synchronous replication.
 2016-05-25 23:36:18 +02:00
Max Neunhoeffer eaacae8c2f Take out a debugging message. 2016-05-25 22:29:12 +02:00
Max Neunhoeffer 4a4472e31e Repair DBServerAgencySync in background. 
Also: Notice role change follower->leader.
 2016-05-25 17:27:27 +02:00
jsteemann 66c8349799 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-25 12:49:48 +02:00
jsteemann ba0d104edf added tests 2016-05-25 12:49:41 +02:00
Jan Steemann f8a941ce50 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-25 11:58:44 +02:00
Jan Steemann 1f9dafd1e3 added test for numeric collection ids 2016-05-25 11:58:34 +02:00
Max Neunhoeffer 0227e47153 Fix shard sync jobs in background. 
Also fix bug that indexes and properties in followers are updated.
 2016-05-25 11:55:07 +02:00
Max Neunhoeffer 37851116ae Better error reporting in syncShards. 2016-05-25 08:05:28 +02:00
Max Neunhoeffer e3db0c4be9 Back to replicationFactor 2 for statistics. 2016-05-25 08:03:36 +02:00
Max Neunhoeffer d801510ac5 Run shard sync in background task. 2016-05-24 23:28:22 +02:00
Jan Steemann 43826ced5c some fixes for issues discovered during tests 2016-05-24 18:53:42 +02:00
Max Neunhoeffer febb36fb1c Put in API to scale cluster via the coordinators. 2016-05-24 15:44:35 +02:00
Max Neunhoeffer e2d20470d9 Switch of leader failure test for now. 2016-05-24 13:44:25 +02:00
Max Neunhoeffer 1e7c998465 Replication factor for statistics collection is 1 (temporarily). 2016-05-24 13:43:46 +02:00
Max Neunhoeffer 9aa1e60779 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-24 13:18:13 +02:00
Max Neunhoeffer 94cd868deb Revert "Run shard sync in background task." 
This reverts commit a8b68b79eb.
 2016-05-24 13:16:51 +02:00
Alan Plum d51a8bd1d6
let -> const 2016-05-24 13:12:21 +02:00
Alan Plum f758c4764e
Use yield* syntax 2016-05-24 13:12:20 +02:00
hkernbach 41e0daec33 more readable charts [ci skip] 2016-05-24 13:07:45 +02:00
hkernbach 40674c3e46 nodes view bugfix 2016-05-24 13:04:51 +02:00
hkernbach 71ba75f527 updated geo indices 2016-05-24 12:47:00 +02:00
hkernbach 9a5d991e81 query editor bugfix 2016-05-24 12:36:20 +02:00
hkernbach 69230b0d19 cluster view bugfix 2016-05-24 12:36:20 +02:00
Max Neunhoeffer fc67b56085 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-24 12:01:22 +02:00
Max Neunhoeffer a8b68b79eb Run shard sync in background task. 2016-05-24 12:01:06 +02:00
hkernbach 5cf1c1aa3c cluster view charts update 2016-05-24 11:20:28 +02:00
hkernbach c3699f3c10 frontend persistent index 2016-05-24 10:50:34 +02:00
Max Neunhoeffer 217ce3cc5c Activate leader failure in resilience test. 2016-05-24 10:26:32 +02:00
hkernbach 2edb8d0f13 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-24 09:46:28 +02:00
hkernbach e8e2d94060 removed console log [ci skip] 2016-05-24 09:46:16 +02:00
Max Neunhoeffer 31bff28489 Factor out synchronizeOneShard. 2016-05-24 09:43:59 +02:00
Max Neunhoeffer b18589c8ab Revert "More output for sync replication tests." 
This reverts commit 50e1ff3fb7.
 2016-05-23 23:15:36 +02:00
Max Neunhoeffer 50e1ff3fb7 More output for sync replication tests. 2016-05-23 23:10:03 +02:00
Max Neunhoeffer 717d110a1d More fixes in DBServerAgencySync js part. 2016-05-23 22:54:21 +02:00
Max Neunhoeffer 7ae9cfcd26 Flush ClusterInfo cache in sync. replication tests. 2016-05-23 22:53:54 +02:00
Max Neunhoeffer 7dec299c3a Improve error messages. 2016-05-23 20:40:48 +02:00
Max Neunhoeffer e06c65a7a6 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-23 20:38:31 +02:00
jsteemann 7080f8293d various AQL changes 
added behavior of TO_STRING() for arrays and objects
added C++ implementation for CONTAINS() function
added memmem implementation for Windows
 2016-05-23 17:10:15 +02:00
Max Neunhoeffer 79a3621430 Fix sync repl test. 2016-05-23 16:57:07 +02:00
Max Neunhoeffer 6b652d548f Avoid system collection servers in resilience tests. 2016-05-23 14:14:55 +02:00
Max Neunhoeffer 611b7f9ee0 Repair resilience for system collections. 
Plus a lot of synchronous replication bugfixes.
 2016-05-23 14:02:01 +02:00
Andreas Streichardt 46a883d6eb Add /_admin/server/id api 2016-05-23 11:49:36 +02:00
Max Neunhoeffer 6cd5e5f2cf Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-23 08:58:06 +02:00
jsteemann b834adee47 honor --database.wait-for-sync when creating collections via HTTP API 2016-05-21 00:10:10 +02:00
jsteemann ce6046e19d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-21 00:09:12 +02:00
jsteemann c4ec5a1204 fixed some issues with persisted index 2016-05-21 00:08:53 +02:00
Max Neunhoeffer 540e266c27 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-20 22:09:39 +02:00
hkernbach be57a6da96 grunt build 2016-05-20 21:34:48 +02:00
hkernbach 488aa710da webui: prep for persistent index 2016-05-20 21:29:27 +02:00
hkernbach c83b1dd736 removed console.logs [ci skip] 2016-05-20 21:23:25 +02:00
hkernbach c18429ece0 scss lint 2016-05-20 21:21:30 +02:00
hkernbach 97ad8b462f fixed a coordinator bug in the web ui 2016-05-20 21:12:34 +02:00
hkernbach f8a837207f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-20 17:37:50 +02:00
hkernbach cdb5cd9b03 clusterFrontend configuration 2016-05-20 17:37:42 +02:00
Andreas Streichardt bca08d012f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-20 17:37:00 +02:00
Andreas Streichardt 6daef7b05e Fix missing databaseUrl links 2016-05-20 17:36:25 +02:00
Wilfried Goesgens 61f89caa98 Fresh swagger.json 2016-05-20 17:29:44 +02:00
hkernbach 6a0e40de04 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-20 17:20:25 +02:00
hkernbach c880552759 read cluster state from frontendConfiguration 2016-05-20 17:19:58 +02:00
Alan Plum 914e8628ed
Default JWT algorithm to HS512 
Most secure option right now.
 2016-05-20 16:40:10 +02:00
Andreas Streichardt 7e73874aa5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-20 16:38:55 +02:00
Andreas Streichardt 5754f6e6d7 Fix missing databaseUrl 2016-05-20 16:36:30 +02:00
Andreas Streichardt ecaaf78a23 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-20 16:03:09 +02:00
Andreas Streichardt 8f3b0f048e typo in error message 2016-05-20 16:03:01 +02:00
jsteemann cdb728f807 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-20 16:00:10 +02:00
Max Neunhoeffer c9c6f14687 Add rr support to testing.js. 2016-05-20 15:15:51 +02:00
Max Neunhoeffer a73c617da2 Revert "Temporarily go back to unresilient system collections." 
This reverts commit bf2642c7bf.
 2016-05-20 15:07:25 +02:00
Max Neunhoeffer 6b35369e93 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-20 14:24:54 +02:00
Max Neunhoeffer bf2642c7bf Temporarily go back to unresilient system collections. 2016-05-20 14:24:20 +02:00
hkernbach 97a8de7ceb cluster statistics fix 2016-05-20 14:23:33 +02:00
hkernbach 72e29c076f jslint 2016-05-20 13:49:06 +02:00
jsteemann b7ca25894a added correctness test for RocksDB values 2016-05-20 13:41:43 +02:00
hkernbach 5f60ebd6c4 added warning notifications 2016-05-20 13:41:10 +02:00
hkernbach db3092502f scss 2016-05-20 13:31:08 +02:00
hkernbach e59b6acd03 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-20 13:30:48 +02:00
hkernbach 9e6df7dd30 replication factor, shards, removed console logs 2016-05-20 13:30:42 +02:00
Max Neunhoeffer b24bbeeda9 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-20 12:53:54 +02:00
Max Neunhoeffer d90e31eb71 System collections now resilient. :-) 2016-05-20 12:53:39 +02:00
hkernbach 105c43267c scss modal 2016-05-20 12:39:39 +02:00
hkernbach f2eb838e0b modal view bugfix 2016-05-20 12:34:43 +02:00
Jan Steemann a8e2e3021e added some tests 2016-05-20 12:15:19 +02:00
Jan Steemann 94f2eb0221 added test 2016-05-20 11:22:54 +02:00
hkernbach 4cc2149641 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-20 10:49:34 +02:00
hkernbach 721b906d08 grunt 2016-05-20 10:49:27 +02:00
Max Neunhoeffer 4eb611583e Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-20 10:05:48 +02:00
Max Neunhoeffer e47a436ac6 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-20 09:53:43 +02:00
Max Neunhoeffer d27af40691 Tune shard synchronization. 2016-05-20 09:53:26 +02:00
hkernbach 42c02730e7 user image 2016-05-20 09:53:15 +02:00
hkernbach 4d9e2681bf added missing file 2016-05-20 09:40:59 +02:00
Max Neunhoeffer 523a58ecc9 Expose replicationFactor in HTTP API and in arangosh. 2016-05-19 23:09:49 +02:00
Max Neunhoeffer 29e68fdbd6 Test target resilience with synchronous replication test. 2016-05-19 22:56:24 +02:00
Max Neunhoeffer 1256159651 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-19 22:41:25 +02:00
Max Neunhoeffer 61d8eb5fc9 Move synchronous replication test to new location. 2016-05-19 22:40:52 +02:00
hkernbach 70968b5b41 grunt 2016-05-19 18:32:10 +02:00
hkernbach 2350d83444 grunt file 2016-05-19 18:28:59 +02:00
hkernbach 60fa9cb996 web ui collection api change 2016-05-19 18:28:32 +02:00
hkernbach 0924cf1e59 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-19 18:18:08 +02:00
hkernbach 805156daaf jslint 2016-05-19 18:17:59 +02:00
jsteemann 3b318805ec don't leak buffers 2016-05-19 18:15:08 +02:00
hkernbach 24b90390cb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-19 17:59:12 +02:00
hkernbach 261dc85217 frontend cleanup 2016-05-19 17:59:05 +02:00
Jan Steemann 4a49d7c6f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-19 17:56:43 +02:00
Jan Steemann e5ceaf85b4 changed structure of response to GET /_api/collection 2016-05-19 17:56:15 +02:00
hkernbach efb1691c3c fixed min file usage 2016-05-19 17:46:08 +02:00
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