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

11793 Commits

Author SHA1 Message Date
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
jsteemann 51447ec2aa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-13 19:39:25 +02:00
hkernbach 0ca4db3c18 added replication factor 2016-05-13 19:00:26 +02:00
jsteemann 1faaa18f6e display "const" attribute 2016-05-13 18:51:20 +02:00
jsteemann e5331da19f added functions to frontend 2016-05-13 18:51:10 +02:00
hkernbach 722fc88212 dashboard scss 2016-05-13 17:57:26 +02:00
hkernbach 628474f54e sessions value generation 2016-05-13 17:48:44 +02:00
hkernbach a32538e94b css 2016-05-13 17:16:25 +02:00
hkernbach 736bee7655 query spotlight bugfix 2016-05-13 16:43:43 +02:00
hkernbach e74b229cc0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-13 16:32:57 +02:00
hkernbach fdd6457091 styling 2016-05-13 16:32:52 +02:00
jsteemann 34e27147f1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-13 14:26:54 +02:00
jsteemann 0828abbb5c query less documents 2016-05-13 14:26:34 +02:00
hkernbach 57178e6bc2 frontend now deletes cursor if not needed anymore 2016-05-13 14:15:38 +02:00
hkernbach f262cdf5f0 scss 2016-05-13 14:15:21 +02:00
hkernbach dcdda8350a merge 2016-05-13 13:39:21 +02:00
hkernbach 90edd4312e queryView 2016-05-13 13:36:12 +02:00
hkernbach c98e533246 scss 2016-05-13 13:35:59 +02:00
hkernbach bbaffd9ec8 jslint 2016-05-13 13:35:38 +02:00
jsteemann a259e73923 try avoiding "line too long" errors 2016-05-13 13:16:05 +02:00
Michael Hackstein a7dfd83d00 JSLint line to long bogus stuff 2016-05-13 13:16:01 +02:00
hkernbach 878072aee6 db tile positioning fix 2016-05-13 12:54:04 +02:00
hkernbach 2d4ea8de3b removed wrong capitalize option 2016-05-13 12:47:45 +02:00
hkernbach a45044904b grunt build 2016-05-13 11:23:54 +02:00
hkernbach 5fb513d21b Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-13 11:06:01 +02:00
hkernbach 528cedbd79 improved login view 2016-05-13 11:05:55 +02:00
Frank Celler dc6cb6f2c8 .S files must be in capital case to have preprocessor handle them 2016-05-12 15:20:14 +00:00
hkernbach 75e2542f66 grunt 2016-05-12 16:40:05 +02:00
hkernbach 5cbac36365 cluster frontend bugfixes 2016-05-12 15:23:19 +02:00
jsteemann abb0f36d55 fixed hashes 2016-05-12 11:11:20 +02:00
jsteemann 988413021f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 10:24:21 +02:00
Kaveh Vahedipour de9618572c Faulty implementation of checks for multiple preconditions in agency 2016-05-12 10:02:13 +02:00
jsteemann ace3d4b900 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 09:07:47 +02:00
Kaveh Vahedipour 4efb6aac7f oops pushed conflict 2016-05-12 08:51:10 +02:00
Kaveh Vahedipour ed94cbbdcc cluster supervision moves broken leaders 2016-05-12 08:36:41 +02:00
jsteemann d4cb93fb9c added TYPENAME() and HASH() functions 2016-05-11 23:54:00 +02:00
jsteemann 130493d481 micro optimizations 2016-05-11 21:02:20 +02:00
Frank Celler 0ac892bbb2 removed builtin shell 2016-05-11 16:50:52 +02:00
Frank Celler fd22d443e6 generated swagger 2016-05-11 15:47:33 +02:00
Andreas Streichardt 5d3abc879e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-11 15:31:11 +02:00
Andreas Streichardt 4d13e8fb1b _listDatabases() => _databases() 2016-05-11 15:30:47 +02:00
Kaveh Vahedipour b4a5d49969 git push 
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
 2016-05-11 14:59:53 +02:00
Kaveh Vahedipour 5f8f8a628a cluster supervision moves broken leaders 2016-05-11 14:59:10 +02:00
Max Neunhoeffer 4ca4832321 Repair aardvark routes for cluster frontend. 
This gets rid of agency-communication.js for good.
This removes the last instance of ArangoAgency.list calls.
 2016-05-11 14:15:57 +02:00
jsteemann e2c7736ba8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-11 11:50:36 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
Max Neunhoeffer a0ea938feb Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-11 11:20:33 +02:00
Max Neunhoeffer daaa443e0d Switch on waitForSync in agency tests. 2016-05-11 11:19:40 +02:00
jsteemann 26ce1e1737 remove printing 2016-05-11 09:53:51 +02:00
Jan Steemann d2a1c9cf4a jslint 2016-05-10 20:16:10 +02:00
Andreas Streichardt 053b0222bc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-10 19:52:26 +02:00
Andreas Streichardt 5ee179d7ae fix agency communication 2016-05-10 19:52:04 +02:00
Kaveh Vahedipour 6694179e57 cluster supervision moves broken leaders 2016-05-10 19:39:23 +02:00
Andreas Streichardt ab4a14b384 remove list tests (functionality removed) 2016-05-10 19:00:46 +02:00
Andreas Streichardt 2c7b7450e1 handlePlanChange() will now use the cache 2016-05-10 18:42:30 +02:00
Andreas Streichardt fb8c90b28c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-10 15:08:21 +02:00
Andreas Streichardt 6d9e54471b Fix replacing secondary 2016-05-10 15:08:07 +02:00
hkernbach c0ba61e5fa Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-10 14:59:41 +02:00
hkernbach 95f42778d0 frontend removed cap contraint 2016-05-10 14:58:37 +02:00
Michael Hackstein ffb5ec8159 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-10 14:47:27 +02:00
Kaveh Vahedipour c144f78775 supervision has node in agency 2016-05-09 19:22:37 +02:00
Alan Plum 1c87085f73
ES6 > lodash 2016-05-09 18:20:06 +02:00
Alan Plum e05c9440b9
Use manifest instead of service in service.toJSON 2016-05-09 18:18:37 +02:00
hkernbach b3e418aff7 service view 2016-05-09 18:15:48 +02:00
Alan Plum 3deb641d00
Make sure headers exists before adding headers 2016-05-09 18:12:34 +02:00
Alan Plum 6459b39159
Fix missing name/version in generated foxxes 2016-05-09 18:12:33 +02:00
Michael Hackstein e9787018b3 The Pattern matching now allows a minDepth of 0 and even a complete search of depth 0. 2016-05-09 17:48:55 +02:00
jsteemann 17ec223221 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-09 15:58:31 +02:00
jsteemann 4612869028 show execution location of execution nodes in ArangoShell 2016-05-09 15:58:14 +02:00
Andreas Streichardt 64c8c2d8ae Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 15:46:02 +02:00
Andreas Streichardt 4ae141de06 Simple api calls are gone! 2016-05-09 15:45:46 +02:00
Max Neunhoeffer 27532d596f Remove dead code. 2016-05-09 14:22:41 +02:00
hkernbach 3284020fb9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 11:38:47 +02:00
Max Neunhoeffer e3abdeb73c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 11:16:30 +02:00
Max Neunhoeffer d48342d3b5 Change sleep to wait. 2016-05-09 11:16:16 +02:00
Michael Hackstein 914bb6c93e Fixed JSLint 2016-05-09 11:03:30 +02:00
hkernbach afff208abe Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 10:26:02 +02:00
Michael Hackstein a24fc0757d Added some more tests for wired AQL append input parameters. 2016-05-09 09:57:56 +02:00
Michael Hackstein 6f4a65d7a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 09:39:33 +02:00
Michael Hackstein 8dd27b01f8 Added an Index and an AQL statement to the quickie test. 2016-05-09 09:39:23 +02:00
Kaveh Vahedipour c8dca04054 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-09 08:58:39 +02:00
Kaveh Vahedipour 220c286a11 agency compaction to c++ database api 2016-05-09 08:12:22 +02:00
jsteemann e1f874ad4a jslint 2016-05-07 07:56:16 +02:00
Max Neunhoeffer b5c87fba33 Add a trivial quickie test and a convenience script. 2016-05-06 22:47:17 +02:00
Andreas Streichardt 9cbf7aae33 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-06 19:12:30 +02:00
Jan Steemann 0bd61cf928 removed option `--server.default-api-compatibility` 2016-05-06 18:38:37 +02:00
Jan Steemann b2171e425d removed unused functions 2016-05-06 17:59:06 +02:00
Andreas Streichardt 9cbe13dd43 Merge branch 'json_agency_comm' into devel 2016-05-06 17:21:41 +02:00
Andreas Streichardt 3773b0e66c Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-06 17:04:04 +02:00
Andreas Streichardt 04ba5156e5 Rework planned collection loading 2016-05-06 17:03:13 +02:00
hkernbach fcff0d9a20 scss 2016-05-06 15:32:58 +02:00
hkernbach 66909b7ad8 login view 2016-05-06 15:32:42 +02:00
Jan Steemann 838e3dc866 fixed handling of externals in some cases 2016-05-06 11:52:06 +02:00
Max Neunhoeffer 5690c0410c Remove option replicationQuorum which was unused as of now. 2016-05-06 09:53:01 +02:00
hkernbach 11f418ff80 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-06 08:43:11 +02:00
Kaveh Vahedipour 35d604e9e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 18:17:00 +02:00
Michael Hackstein 262ff9b75e Added a test for intersection with documents directly out of the database. 2016-05-04 17:32:13 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
Michael Hackstein 62f2d55c20 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 16:46:13 +02:00
Michael Hackstein 4f674220ab Added brute force tests in AQL functions. 2016-05-04 16:45:59 +02:00
Michael Hackstein ca836216fc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-04 16:38:16 +02:00
jsteemann bb4b1b8b88 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 16:20:28 +02:00
jsteemann f2d014ff6a bugfixes 2016-05-04 16:10:04 +02:00
Michael Hackstein 04753a9131 Improved type checking of options in a graph function. 2016-05-04 15:54:16 +02:00
Wilfried Goesgens a9e6665b8a Adjust config db dir in test for the new way of having it named arangodb3 2016-05-04 15:28:49 +02:00
Max Neunhoeffer f0db06b47d Fix test and jslint. 2016-05-04 14:50:37 +02:00
Alan Plum b11af7f6a4
Make scss-lint happy 
I guess? Maybe? This is what you want, isn't it?
 2016-05-04 13:57:02 +02:00
Alan Plum 1b638c1abf
Update graphql-sync 
skip ci
 2016-05-04 12:51:12 +02:00
Alan Plum 7e2603bdcc Merge pull request #1811 from arangodb/kill-the-monkey 
Remove monkeypatches
 2016-05-04 11:42:24 +02:00
Max Neunhoeffer eeb597fc85 Fix a test. 2016-05-04 11:37:55 +02:00
Max Neunhoeffer 0ac60a8fe7 Merge branch 'devel' into json_agency_comm 2016-05-04 11:15:02 +02:00
Max Neunhoeffer 1b0b9ae5df Take out getTargetServerEndpoint. 
This used Target/MapIDToEndpoint which is now gone.
 2016-05-04 11:10:42 +02:00
Michael Hackstein aab91d51e6 Fixed JSLint 2016-05-04 10:40:06 +02:00
Michael Hackstein c8cdb5ab93 Added a test for large overlapping ranges in skiplists. This covers a bug where unification of results lead to early lookup abortion. 2016-05-04 10:17:29 +02:00
hkernbach 6d5b29ca70 dashboard bugfix 2016-05-03 17:57:53 +02:00
hkernbach 7572db543e scss lint 2016-05-03 17:53:40 +02:00
hkernbach 0365e685d4 grunt build 2016-05-03 17:52:11 +02:00
hkernbach 9fa6736e5e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-03 17:47:00 +02:00
hkernbach 3114021f93 changed aardvark login mechanism 2016-05-03 17:46:51 +02:00
Wilfried Goesgens d944140edf Unify crash handling between alive & shutdown checks. 2016-05-03 17:41:33 +02:00
Frank Celler ec2418c500 added testBuckets 2016-05-03 16:45:28 +02:00
Wilfried Goesgens 18c04a0e20 Make calling of executable fail if true is passed in. 2016-05-03 16:24:05 +02:00
Kaveh Vahedipour 7ac2f7111a Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:48 +02:00
Kaveh Vahedipour 5d911bceb4 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:36 +02:00
Andreas Streichardt f882db1436 Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:48:17 +02:00
Andreas Streichardt f5f040e21a Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:47:00 +02:00
Kaveh Vahedipour d2513d7579 wrong implementation of property collectionsetting through coordinator 2016-05-03 15:45:19 +02:00
Wilfried Goesgens 3776dedaec Fix windows tests; split test list by dots (.) instead of semicolon (;) since jenkins creates paths with them, they're hard to handle. 2016-05-03 15:35:56 +02:00
Michael Hackstein f9a8aab639 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-03 15:28:12 +02:00
Michael Hackstein be6b8908fa Fixed cluster crud tests. They did by accident not run into the untested state thus far. 2016-05-03 15:28:01 +02:00
hkernbach b4d9e86b4d added offline view 2016-05-03 15:18:27 +02:00
Kaveh Vahedipour c6ab722f97 corrected for cluster shell agency test 2016-05-03 15:01:52 +02:00
Alan Plum 4ea93e84dc
Revert "Patch jshint to ignore _shallowCopy" 
This reverts commit c7bdcb5e1c.
 2016-05-03 14:55:33 +02:00
Alan Plum 85950c9798
Remove monkeypatches.js 2016-05-03 14:55:32 +02:00
Alan Plum c1828234d6
Move shallowCopy and propertyKeys into @arangodb/util 2016-05-03 14:55:32 +02:00
Alan Plum eef85f6202
Sort Foxx manifest fields 2016-05-03 14:08:19 +02:00
Wilfried Goesgens a455394a21 Properly detect the boost test, and fail if we can't find it. 2016-05-03 13:51:51 +02:00
Jan Steemann c539573978 re-introduced ShapedJson variable for 2.8-compatibility 2016-05-03 12:18:45 +02:00
Jan Steemann a19c437cdd jslint 2016-05-03 12:04:13 +02:00
Alan Plum 4d6e0d5d3b
Generate README for new Foxx services 2016-05-03 11:33:23 +02:00
Kaveh Vahedipour 3608d91f87 Corrected create database in coordinator 2016-05-03 10:06:20 +02:00
Michael Hackstein adb7c2cee2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-03 09:23:22 +02:00
Kaveh Vahedipour dab8accd5b Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 08:57:09 +02:00
Alan Plum c7bdcb5e1c
Patch jshint to ignore _shallowCopy 
Revert when _shallowCopy is removed.
 2016-05-03 00:51:50 +02:00
Alan Plum 698dfae860
Print jshint exceptions to console 2016-05-03 00:51:49 +02:00
jsteemann 065d1bfa9a don't fail 2016-05-03 00:44:55 +02:00
jsteemann 64f55422ce jslint 2016-05-02 19:53:16 +02:00
Kaveh Vahedipour d0e15bb046 create database is semifunctional 2016-05-02 19:03:00 +02:00
Alan Plum 82a43bfca7
service.name -> service.manifest.name etc 2016-05-02 18:56:04 +02:00
Alan Plum 53c7169d5b
Remove redundant test 
The name and version fields are now optional.
 2016-05-02 18:52:02 +02:00
Alan Plum 3bb355e3dc
Don't default to index.js 2016-05-02 18:47:37 +02:00
Alan Plum 8643f45c25
Add missing index.js files 2016-05-02 18:45:51 +02:00
Andreas Streichardt b2190aacb1 Announce new, boostraped dbs correctly in agency 2016-05-02 18:40:46 +02:00
Kaveh Vahedipour de4d6efec9 corrected changes for new json structure 2016-05-02 18:19:21 +02:00
Kaveh Vahedipour b791188f18 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 17:49:11 +02:00
Andreas Streichardt 276803718d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 17:46:00 +02:00
Andreas Streichardt 0790b00737 hotfix for cluster startup 2016-05-02 17:45:39 +02:00
Alan Plum 3fb6d517f7
Object#propertyKeys -> internal.propertyKeys 2016-05-02 17:34:08 +02:00
Michael Hackstein 1e9b3a7762 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 17:31:05 +02:00
Alan Plum 571e07c613
Missed one 2016-05-02 17:23:51 +02:00
Alan Plum 4af0c67c5c
Unbreak shallowCopy 2016-05-02 17:19:01 +02:00
Max Neunhoeffer 12bf5a2dde Fix cluster.js. 2016-05-02 16:48:59 +02:00
hkernbach 3af8cdbbe2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 16:35:30 +02:00
hkernbach ffef593987 warmup screen dashboard 2016-05-02 16:35:23 +02:00
hkernbach 0851b8b8c1 warmup screen dashboard 2016-05-02 16:34:40 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Kaveh Vahedipour 88ea3473b0 too much output in logs 2016-05-02 16:07:00 +02:00
Alan Plum 0c420c746c
Remove unused code 2016-05-02 15:53:58 +02:00
Max Neunhoeffer bfe945b91b New swagger data. 2016-05-02 15:53:13 +02:00
Max Neunhoeffer 6766516675 New generated swagger API. 2016-05-02 15:53:13 +02:00
Max Neunhoeffer e8a03e33ca New swagger stuff. 2016-05-02 15:53:13 +02:00
Alan Plum 649c571e54
Prefer path.join over fs.join 2016-05-02 15:50:07 +02:00
Alan Plum 11c7db4375
Quality of life improvements in Foxx 2016-05-02 15:50:07 +02:00
Alan Plum e1d384813e
Make Foxx name/version optional 2016-05-02 15:50:06 +02:00
Andreas Streichardt 3e470891f8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 15:21:06 +02:00
Andreas Streichardt b55ac05a49 fix init 2016-05-02 15:20:31 +02:00
hkernbach 9d83165ccf Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:44:27 +02:00
hkernbach 3e21fb9476 grunt 2016-05-02 14:44:09 +02:00
Alan Plum 53dc168a71
Linting 2016-05-02 14:42:10 +02:00
Alan Plum 2bd0f59d9d
Bump jshint to 2.9.2 2016-05-02 14:42:09 +02:00
Alan Plum f81c946fd7
app -> service 2016-05-02 14:42:08 +02:00
Alan Plum ea7ff40a9c
Warn when specifying manifest.engine 2016-05-02 14:42:08 +02:00
hkernbach 1242eb156e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:39:23 +02:00
hkernbach f119e27822 hotkeys 2016-05-02 14:27:45 +02:00
Andreas Streichardt 60cf2c6357 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:18:44 +02:00
hkernbach 5749761a1e scss 2016-05-02 14:05:55 +02:00
hkernbach e488451142 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:03:43 +02:00
hkernbach b3c16e6659 query editor usability 2016-05-02 14:03:34 +02:00
Andreas Streichardt 5d7b8acba0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 14:00:50 +02:00
Andreas Streichardt 974ecdc208 Implement Current callback 2016-05-02 14:00:26 +02:00
Jan Steemann 4a8052e309 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-02 13:29:46 +02:00
Jan Steemann 2b0f3f7b57 change behavior of arithmetic operators, TO_STRING and TO_NUMBER 2016-05-02 13:29:29 +02:00
jsteemann fb912c28b6 jslint 2016-05-02 13:19:22 +02:00
Andreas Streichardt b1d4a9d9d7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 12:21:00 +02:00
Andreas Streichardt 18ea698038 Restructure code so that the installed versions are being returned by 
the plan changer
 2016-05-02 12:19:07 +02:00
hkernbach 043c1f1222 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 10:34:17 +02:00
hkernbach ebfa590e76 query view template 2016-05-02 10:33:54 +02:00
Alan Plum 081a6f6a7f
Collection session storage should autoUpdate by default 2016-05-02 10:29:23 +02:00
Michael Hackstein 80bb9aeff4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 09:32:22 +02:00
hkernbach 16fea155d3 query editor bugfix 2016-05-02 09:14:33 +02:00
hkernbach 75c2b763a0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-01 15:35:47 +02:00
jsteemann c7490a211c added fail() to tests 2016-05-01 14:46:59 +02:00
jsteemann 9c1e0fc2c6 micro optimizations 2016-05-01 14:13:34 +02:00
hkernbach 3fd54ef54a grunt 2016-04-30 00:42:58 +02:00
hkernbach 060b342f2b shortcut view 2016-04-30 00:41:04 +02:00
hkernbach 07104e02ff grunt build 2016-04-30 00:04:03 +02:00
hkernbach 0822c1d505 changed version check style, bugfixes, scss 2016-04-29 23:58:30 +02:00
hkernbach 82126f7ae9 frontend views, bugfixes 2016-04-29 22:14:29 +02:00
hkernbach b1162528be scss, error handling, notifications 2016-04-29 21:01:26 +02:00
hkernbach 5adf32b4b9 jslint 2016-04-29 19:53:12 +02:00
hkernbach 6f78846600 added a frontend event listener 2016-04-29 19:49:46 +02:00
Kaveh Vahedipour b962ee0b99 correct unit tests 2016-04-29 19:26:10 +02:00
hkernbach 5a3e931418 user management error handling, query editor, spotlight function 2016-04-29 19:12:46 +02:00
Kaveh Vahedipour 9fdf79a064 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 18:42:02 +02:00
Max Neunhoeffer 907edaf5ac Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 18:38:13 +02:00
Max Neunhoeffer 79113bd4e9 Take external bootstrap out of testing.js. 2016-04-29 18:37:35 +02:00
hkernbach 037ec3007d query editor bugfix 2016-04-29 18:14:35 +02:00
Michael Hackstein ddc7b2ca98 Further tests for AQL externals 2016-04-29 17:39:43 +02:00
Michael Hackstein 0ca6452bab Started to add some tests for VPack externals in AQL. 2016-04-29 17:30:50 +02:00
hkernbach 18bde3282c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 17:03:24 +02:00
Kaveh Vahedipour 82417a763e Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:37:18 +02:00
Max Neunhoeffer a8e70bd8fa Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 16:36:54 +02:00
Max Neunhoeffer 18b72dfdbe Fix cluster startup. 2016-04-29 16:36:41 +02:00
Alan Plum cc4ab07705
Session storage ttl should be specified in secs not mins 2016-04-29 16:36:26 +02:00
Kaveh Vahedipour 86959d83a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:29:05 +02:00