1
0
Fork 0
Commit Graph

11441 Commits

Author SHA1 Message Date
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
Alan Plum b83921bc62
jwt sessions: expiry -> ttl 2016-04-29 16:11:14 +02:00
hkernbach 23d780cf23 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 15:37:24 +02:00
hkernbach cddb11d315 added *.swp to gitignore 2016-04-29 15:37:15 +02:00
Alan Plum 841790e524
Unbreak HTTP tests 2016-04-29 15:33:17 +02:00
Alan Plum 61d35d5906
Add an errorNum to gharial ArangoErrors 2016-04-29 15:33:17 +02:00
jsteemann ea46d40bcd remove unused variable 2016-04-29 15:16:24 +02:00
Alan Plum fb2a9818e6
Session storages need both forClient and fromClient 2016-04-29 15:04:03 +02:00
Alan Plum 80dbea94a4
Make gharial behave better on errors again 2016-04-29 15:04:02 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
jsteemann ceb138d888 translate more errors 2016-04-29 14:30:11 +02:00
Max Neunhoeffer 0f981b560d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-29 13:59:30 +02:00
Max Neunhoeffer b05464b78c Cluster bootstrap revolution. 2016-04-29 13:59:12 +02:00
Alan Plum c253026711
Support iterator API in query results 2016-04-29 13:30:55 +02:00
jsteemann 64ee910e38 move system attributes to the front of objects 2016-04-29 13:13:39 +02:00
Alan Plum c829737568
Don't use _users in aardvark directly 2016-04-29 12:58:51 +02:00
hkernbach 29e3d84cbf grunt 2016-04-29 12:46:39 +02:00
hkernbach 67cf450326 frontend query editor 2016-04-29 12:46:28 +02:00
Kaveh Vahedipour 4c3d906bd8 UserVersion, HB interval integers 2016-04-29 11:19:40 +02:00
hkernbach 61298f1181 grunt 2016-04-29 10:51:14 +02:00
Kaveh Vahedipour 7733e16392 UserVersion is a number 2016-04-29 10:45:27 +02:00
hkernbach 4e100d0566 grunt build 2016-04-29 10:40:36 +02:00
hkernbach 7532a393bc frontend bugfixes & several improvements 2016-04-29 10:29:08 +02:00
hkernbach 7d5fa563b8 fixed a query editor bug 2016-04-29 09:51:32 +02:00
hkernbach 9abbd9afb2 fixed a query editor bug 2016-04-29 09:49:06 +02:00
jsteemann 6ac4c809ee do not create markers on the heap, but create them in the WAL space directly 2016-04-29 01:01:10 +02:00
Wilfried Goesgens 8f9992ac62 Be more verbose if the server crashes during the tests. 2016-04-28 17:20:02 +02:00
Kaveh Vahedipour ee2115ceeb remaining verbose output 2016-04-28 16:28:59 +02:00
hkernbach ed03ae8bdc grunt build 2016-04-28 15:30:32 +02:00
Kaveh Vahedipour e81e3e51e0 javascript side of jsonified agency 2016-04-28 15:15:55 +02:00
hkernbach 2a08252bc9 scss cleanup, fixed broken route setting 2016-04-28 14:56:20 +02:00
Jan Steemann cdc9b8e774 re-active test 2016-04-28 13:47:28 +02:00
Frank Celler 8b51bdd336 use regexp to split test cases 2016-04-28 13:35:19 +02:00
Frank Celler 90c3675d6b allow , separated use cases 2016-04-28 13:29:58 +02:00
hkernbach 8dcc0740c8 several frontend bugfixes, optimizations 2016-04-28 12:20:53 +02:00
Kaveh Vahedipour 9d314699b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-28 09:18:50 +02:00
jsteemann cd45a52ba5 attempt to finish startup order 2016-04-27 22:54:29 +02:00
Kaveh Vahedipour 6329d90155 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-27 17:27:52 +02:00
Kaveh Vahedipour bb834bb4a1 cluster startup ok. execept of corrdinator. 2016-04-27 17:27:06 +02:00
Kaveh Vahedipour 049cc8602e careful with loops :( 2016-04-27 16:53:09 +02:00
Kaveh Vahedipour f3ff880c85 Node was not making correct == for rhs json objects 2016-04-27 13:10:48 +00:00
jsteemann 5ec9cff904 renamed arangob to arangobench 2016-04-27 12:15:19 +02:00
hkernbach e848f9cbab added missing meta tag 2016-04-27 01:23:19 +02:00
hkernbach 748fbb29ef Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-27 01:10:54 +02:00
hkernbach 03a5bb17c2 changed aardvark job mechanism 2016-04-27 01:10:37 +02:00
jsteemann 285da023e5 ShapedJson removal 2016-04-27 00:45:15 +02:00
hkernbach 3c49e87796 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 17:38:52 +02:00
hkernbach ba2466268f scss lint 2016-04-26 17:38:40 +02:00
Jan Steemann 82e0077de0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-26 15:53:23 +02:00
hkernbach e4be342eb0 backbone collection: removed fullCount options 2016-04-26 15:18:35 +02:00
Jan Steemann 174a3b17f4 fixed test 2016-04-26 15:04:21 +02:00
hkernbach 662f1fe5a2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 15:00:19 +02:00
hkernbach c80b44c994 grunt build 2016-04-26 15:00:11 +02:00
Michael Hackstein c1191d4268 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 14:50:28 +02:00
hkernbach 892461dbd3 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-26 14:35:54 +02:00
hkernbach 776dea96da views, scss, templates, router 2016-04-26 14:35:39 +02:00
jsteemann d21cdb50ad speed up transactions 2016-04-26 11:58:10 +02:00
Michael Hackstein bd302a023c Reduced the nesting level of arrays in AQL test. Icannot be executed on MacOs and asan 2016-04-26 11:50:19 +02:00
Kaveh Vahedipour 4e2d86dc67 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-26 10:55:13 +02:00
jsteemann 021183f14e added tests 2016-04-26 10:23:47 +02:00
Kaveh Vahedipour d4fc6a1062 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 18:37:32 +02:00
Kaveh Vahedipour 0530603763 dirty yet 2016-04-25 18:37:28 +02:00
Alan Plum 7b9085b009
Clear+recreate internal sessions to refresh them 2016-04-25 14:22:10 +02:00
hkernbach 8ab7442475 grunt build 2016-04-25 08:45:42 +02:00
hkernbach 2b18fe67a1 frontend: scss, views, templates, documents view 2016-04-25 08:32:38 +02:00
hkernbach 5c318b324d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 08:11:25 +02:00
jsteemann fe42176772 make system collections a bit smaller 2016-04-24 16:34:40 +02:00
jsteemann f4fb6f0dcd fixed arango-dfdb 2016-04-24 16:19:56 +02:00
jsteemann 58198a834e re-added options for foxx queues 2016-04-24 15:27:08 +02:00
jsteemann 1f05dbb045 attempt to fix upgrade test 2016-04-22 16:50:18 +02:00
hkernbach 685719f855 scss 2016-04-22 14:48:55 +02:00
jsteemann 84e53cb40a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 12:37:06 +02:00
jsteemann 366cb659af fixed wrong options 2016-04-22 12:36:58 +02:00
hkernbach 65394e6390 grunt 2016-04-22 12:36:53 +02:00
hkernbach 67420663ed views 2016-04-22 12:33:13 +02:00
hkernbach 5aa9481bd0 templates 2016-04-22 12:32:37 +02:00
hkernbach 81aacb7c52 scss 2016-04-22 12:32:27 +02:00
hkernbach 9c9f18deec graph viewer bugdix, navigation, scss 2016-04-22 09:14:42 +02:00
hkernbach 2c600544d6 grunt build 2016-04-21 18:53:48 +02:00
hkernbach 2ff6aa39b1 frontend images 2016-04-21 18:53:36 +02:00
hkernbach ed50faa950 login view 2016-04-21 18:49:40 +02:00
hkernbach c5ee12019a scss 2016-04-21 16:44:56 +02:00
hkernbach 9ddd8ed0a5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 15:20:24 +02:00
hkernbach abe9880da7 grunt 2016-04-21 15:20:17 +02:00
hkernbach 1d611d0dd2 scss-lint 2016-04-21 15:17:02 +02:00
Alan Plum 7653fe5eb8
Re-createSid on every access
There's no other way to prevent the internal sid from timing out apparently.
2016-04-21 15:14:01 +02:00
hkernbach ae574ee85c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 15:11:39 +02:00
hkernbach 62370bfba8 scss 2016-04-21 15:11:31 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Jan Steemann 5027d7fe1f documentation for LIKE 2016-04-21 12:46:42 +02:00
hkernbach 98d89f6ac3 scss 2016-04-21 12:33:48 +02:00
Kaveh Vahedipour 1acb0cba6f agency/cluster startups seem correct 2016-04-21 11:19:07 +02:00
hkernbach 5917b77cb5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 10:58:24 +02:00
hkernbach 13dc4e3637 footer, grunt config, dygraph config, navbar, dashboard 2016-04-21 10:58:16 +02:00
Alan Plum 996c4568fb
Fix shell-foxx-swager-spec.js 2016-04-21 10:10:11 +02:00
Max Neunhoeffer 646165f827 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-20 22:38:11 +02:00
Simran Brucherseifer a5ad9f33a9 Minor corrections
Excluded Aardvark, the graph viewer in particular
2016-04-20 22:09:00 +02:00
Alan Plum e7e457b560
ES6ify 2016-04-20 18:34:46 +02:00
Alan Plum a3d5c64532
Object.extend is not a function 2016-04-20 18:13:04 +02:00
Alan Plum e4cfa5ec0d
Throw better errors when install fails 2016-04-20 18:11:49 +02:00
Alan Plum 0529471cdc
Allow passing an error to res.throw as reason 2016-04-20 18:11:49 +02:00
hkernbach 05578e8fbf files not needed 2016-04-20 18:11:05 +02:00
hkernbach 8ed6f3bb49 scss cleanup tiles 2016-04-20 18:08:05 +02:00
hkernbach 346363b8b8 fixed tiles 2016-04-20 18:07:52 +02:00
hkernbach 23e21904be grunt 2016-04-20 17:40:28 +02:00
hkernbach 5cde3c698d grunt 2016-04-20 17:34:50 +02:00
hkernbach 5331c317dd grunt build 2016-04-20 17:28:55 +02:00
hkernbach 4d7a1d2b2e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 17:26:54 +02:00
hkernbach e27fa8ae38 new login mechanism, additional frontend changes 2016-04-20 17:26:44 +02:00
Max Neunhoeffer 13fdd67d38 Better timeouts in synchronisation in heartbeat thread. 2016-04-20 17:24:38 +02:00
Max Neunhoeffer e49893cef8 Prepare testing of synchronous replication. 2016-04-20 17:24:19 +02:00
Alan Plum 96aa1d9129
Add req.json 2016-04-20 17:18:51 +02:00
Alan Plum 7065d29975
Don't add default bodies 2016-04-20 17:18:51 +02:00
Alan Plum eea0a0e259
Deduplicate AQL template bindVars and support AQB 2016-04-20 16:18:19 +02:00
hkernbach 972367b4f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 15:48:21 +02:00
hkernbach 5b7f5114f4 cleaned up grunt build 2016-04-20 15:48:11 +02:00
hkernbach fed6c3602c cleanup grunt build process 2016-04-20 15:47:35 +02:00
Alan Plum ac29066808
Make aql global in arangosh 2016-04-20 15:23:05 +02:00
Alan Plum 2f2c7b5c12
Allow switching databases in login 2016-04-20 15:23:04 +02:00
Alan Plum 2b0c1f6f9a
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 0fff3e661f
_.extend -> Object.assign 2016-04-20 15:23:03 +02:00
Alan Plum 249dddcdf4
Optionally auto-update collection sessions 2016-04-20 15:23:02 +02:00
Alan Plum e7c0a49cfb
Don't use session.userData in system, always update lastAccess 2016-04-20 15:23:01 +02:00
Alan Plum c23d73f78c
Aardvark should always expect auth 2016-04-20 15:23:01 +02:00
Alan Plum 50ae4804f6
Spacing 2016-04-20 15:23:00 +02:00
hkernbach cb8413f174 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 13:57:27 +02:00
hkernbach c6caacc474 modified grunt build 2016-04-20 13:56:45 +02:00
Alan Plum 95b9f8db7e
Nevermind that 2016-04-20 13:45:17 +02:00
Kaveh Vahedipour d53e47c7d5 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-20 11:23:10 +00:00
Alan Plum 8b7a98f2e8
global.aqlQuery -> arangodb.aql 2016-04-20 13:05:27 +02:00
hkernbach 2a8f73593a navigation view 2016-04-20 12:54:43 +02:00
hkernbach e6a9ea7cab disabled dashboard when statistics are not available 2016-04-20 12:54:31 +02:00
hkernbach 78975ceaef dashboard scss 2016-04-20 12:52:50 +02:00
hkernbach ad0f86723a scss dashboard + dropdowns 2016-04-20 12:47:58 +02:00
hkernbach 90bd28f5fb Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-20 12:29:20 +02:00
hkernbach 54c8d4c700 foxx teardown route fix 2016-04-20 12:29:07 +02:00
jsteemann 9d258f47e0 added test case 2016-04-20 12:26:07 +02:00
hkernbach 2d4409e376 aardvark explain route 2016-04-20 12:06:40 +02:00
jsteemann e390da31c1 speed up test 2016-04-20 10:27:06 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Alan Plum 69b5442181
Rebuild aardvark 2016-04-19 20:18:24 +02:00
Alan Plum 2094d1adca
Unbreaky dashboard floats 2016-04-19 20:17:34 +02:00
Alan Plum 2d44ff2839
Patch Swagger-UI to fix param.type undefined error
See https://github.com/swagger-api/swagger-ui/issues/2004
2016-04-19 18:39:22 +02:00
Jan Steemann 76fa336a3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:19:21 +02:00
Jan Steemann 34923ff236 added "enabled" flag for statistics output 2016-04-19 18:19:07 +02:00
Alan Plum 494d5d5855
Foxx.getExports -> legacy 2016-04-19 18:16:18 +02:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Alan Plum 7b76519bbe
Allow res.throw(status, args) 2016-04-19 18:16:18 +02:00
Alan Plum 8a114a58d3
queues.js -> queues/index.js 2016-04-19 18:16:18 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Andreas Streichardt f7a0b10a69 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 18:11:35 +02:00
Andreas Streichardt 95a6540c2e Fix core dump windows stuff 2016-04-19 18:11:18 +02:00