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

12162 Commits

Author SHA1 Message Date
hkernbach 9d856e66b7 gv improvements 2016-07-22 12:56:39 +02:00
Jan Steemann 2aa1ae7db2 added read/write context info 2016-07-22 10:00:46 +02:00
jsteemann f3dfdb57d1 fixed issue #1954 2016-07-21 17:39:27 +02:00
Jan Steemann eb7dd14e95 added test case 2016-07-21 16:12:25 +02:00
Jan Steemann 74f7da4f45 don't copy unneeded registers 2016-07-21 12:10:09 +02:00
Jan Steemann 23dc618311 fix a glitch in explainer output 2016-07-21 12:08:50 +02:00
hkernbach f10859a110 grunt build [ci skip] 2016-07-20 18:07:14 +02:00
hkernbach 069ab502d4 gv 2016-07-20 17:53:16 +02:00
hkernbach e2226b0c64 grunt build [ci skip] 2016-07-20 12:59:19 +02:00
hkernbach 0c6bb3b93f ui aql graph support 2016-07-20 12:58:19 +02:00
hkernbach 36ee370708 query spotlight bugfix 2016-07-20 10:59:40 +02:00
hkernbach 3f3748b278 grunt build [ci skip] 2016-07-20 10:50:40 +02:00
hkernbach c287b22f37 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-20 10:48:43 +02:00
hkernbach 6e62c003b5 aql tabular output 2016-07-20 10:48:36 +02:00
Jan Steemann f269c1c772 fixed issue #1949 2016-07-20 10:17:10 +02:00
Jan Steemann 8369f652a4 fixed issue #1950 2016-07-20 09:38:25 +02:00
PedroFerreiraRamos 5d65be01f1 Add 'Save' and 'New' button for Query Editor #1906 2016-07-19 21:31:31 -03:00
Alan Plum 6bbe8e8098
Fix OAuth2 getActiveUserUrl 2016-07-19 22:27:24 +02:00
hkernbach 8d1e818d79 added query result checks in query editor 2016-07-19 17:36:21 +02:00
hkernbach 5c6aa6fbe8 grunt build [ci skip] 2016-07-19 15:06:50 +02:00
hkernbach 604637abdd gv 2016-07-19 15:06:44 +02:00
Jan Steemann dc51d9dea5 issue #1944: nicer error logging in console.log() 2016-07-18 10:55:52 +02:00
jsteemann 85f02ddc27 eshint 2016-07-18 10:24:16 +02:00
jsteemann 83a9763cc9 added test for V8 segfault 2016-07-18 10:17:48 +02:00
hkernbach 377d556e98 grunt build [ci skip] 2016-07-15 19:21:05 +02:00
hkernbach 11c33882c8 gv settings [ci skip] 2016-07-15 19:16:16 +02:00
hkernbach 171010bf43 added dev button to graphs view [ci skip] 2016-07-14 23:15:48 +02:00
hkernbach 1ed721c722 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-14 21:01:51 +02:00
hkernbach b9a75b42c0 grunt build [ci skip] 2016-07-14 21:01:42 +02:00
Alan Plum 5f97150d3f
Remove jshint 2016-07-14 16:35:08 +02:00
Alan Plum cf302adf26
Always use --global-style when installing npm deps 
This partially reverts commit 8a286a30d9.
 2016-07-14 16:29:20 +02:00
hkernbach 78e83305bc Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-14 15:59:07 +02:00
hkernbach b22c34753e gv - editable & createable nodes, edges [ci skip] 2016-07-14 15:57:18 +02:00
Alan Plum 4ea6517275
Rebuild aardvark 2016-07-14 14:44:42 +02:00
Alan Plum 315b2e15f2
Make sure Show Interface check asks for HTML 2016-07-14 14:44:06 +02:00
Jan Steemann 2441b2f700 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-14 10:09:01 +02:00
Jan Steemann a1c2b7cc63 fixed issue #1941 2016-07-14 10:08:17 +02:00
hkernbach f79ecfc162 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-14 09:37:34 +02:00
hkernbach d5aa534a80 gv [ci skip] 2016-07-14 09:37:21 +02:00
Jan Steemann 6d856efd4f added test for "fake" _key values 2016-07-14 09:29:42 +02:00
jsteemann f5608449b2 fixed issue #1942 2016-07-13 20:32:59 +02:00
hkernbach 39a6e0a73e grunt [ci skip] 2016-07-13 16:40:03 +02:00
hkernbach 1929b24901 gv [ci skip] 2016-07-13 16:39:56 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
Jan Christoph Uhde 03e89265fd Merge branch 'devel' of github.com:arangodb/arangodb into obi-merge-restserver 
* 'devel' of github.com:arangodb/arangodb:
  updated CHANGELOG
  fixed array index batch insertion issue
  Fix syntax errors in  user auth documentation
  fix grammer.
  prevent compile warning
 2016-07-13 11:35:16 +02:00
Jan Steemann 6b7defc737 fixed array index batch insertion issue 2016-07-13 11:32:39 +02:00
Jan Christoph Uhde ff49d7b0b4 Merge remote-tracking branch 'origin/devel' into obi-merge-restserver-next 
* origin/devel: (105 commits)
  Fixed failure tests in SkiplistIndex
  Fixed a bug with reset of new skiplist index iterator
  whitespace removal
  micro optimization for key generator key tracking
  GraphQL! Hype! 🎉
  explicit
  remove unused variable
  explicit
  Fix VS complaints
  complaints
  complaints
  updated CHANGELOG
  fixed issue #1937
  Modified the SkiplistIndex lookup s.t. it does not build one large VPackBuilder containing all combinations of search values, but instead has an option to rewrite it in-place and just has to maintain the intervals.
  ignore revision ids
  fix destructuring of Externals in MERGE
  make it code.
  ignore primary and edge indexes during cluster restore
  grunt build [ci skip]
  semist.
  ...
 2016-07-13 07:33:13 +00:00
Max Neunhoeffer 18925faf8f Merge branch 'devel' into HLC 2016-07-12 22:51:40 +02:00
Alan Plum 284e71c8e0
GraphQL! Hype! 🎉 2016-07-12 17:03:44 +02:00
Jan Steemann 403ba8a30c fixed issue #1937 2016-07-12 15:57:19 +02:00
Max Neunhoeffer 846e6b6127 Merge remote-tracking branch 'origin/devel' into HLC 2016-07-12 15:10:24 +02:00
Jan Steemann 1719d3c993 fix destructuring of Externals in MERGE 2016-07-12 13:37:39 +02:00
hkernbach b1cfb98e09 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-12 10:08:32 +02:00
hkernbach 3e68a42410 grunt build [ci skip] 2016-07-12 10:00:32 +02:00
hkernbach cd36e265ca semist. 2016-07-12 09:53:14 +02:00
hkernbach 1d3406f1e3 gv ui 2016-07-12 09:52:54 +02:00
Jan Steemann 6f3091e30a fix recovery issues 2016-07-12 09:45:45 +02:00
Max Neunhoeffer 4caf01405b New option for maximal port number in testing.js. 2016-07-12 09:04:36 +02:00
Max Neunhoeffer 7571a16c9d Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-07-11 23:46:12 +02:00
Max Neunhoeffer fedcc9cb17 Improving trace logging for syncCollectionFinalize. 2016-07-11 23:37:06 +02:00
Jan Steemann 2d7faa795a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-11 18:39:18 +02:00
Jan Steemann 10db618129 fix recovery 2016-07-11 18:36:00 +02:00
Max Neunhoeffer 8f69fb74f5 Further fixes of commonProperties and friends. 2016-07-11 14:42:42 +00:00
Max Neunhoeffer 49dd799ca9 Fix _countCommonProperties. 2016-07-11 15:08:52 +02:00
Max Neunhoeffer 1b1edb0bcc Ignore _rev in _commonNeighbours for general graphs. 2016-07-11 14:47:37 +02:00
Jan Steemann 55532a9fa5 removed some log message 2016-07-08 14:44:11 +02:00
Jan Steemann cb14a63778 pass UDF name into UDF call via this argument 2016-07-08 14:31:14 +02:00
hkernbach ea9fda186d grunt build 2016-07-07 16:44:28 +02:00
hkernbach 87ddbf7f1d gv 2016-07-07 16:44:21 +02:00
Jan Steemann 351f800eb1 fix upsert 2016-07-07 15:15:43 +02:00
Jan Steemann f8b61c6723 added tests 2016-07-07 12:22:24 +02:00
Jan Steemann 2aaf941110 added test 2016-07-07 12:22:07 +02:00
hkernbach 80f8ee1308 grunt build 2016-07-07 12:16:11 +02:00
hkernbach 8540e07e70 web ui semistandard 2016-07-07 11:57:42 +02:00
hkernbach 413d813e38 gv 2016-07-07 09:02:23 +02:00
hkernbach 27fffd4c4e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-07 08:27:44 +02:00
hkernbach a358c27503 grunt 2016-07-07 08:27:37 +02:00
Alan Plum 6c25aa7648
Restrict file 404 messages to relative path 2016-07-06 15:43:47 +02:00
Alan Plum 5c115b1cdb
Fix Foxx config not being saved 2016-07-06 15:24:47 +02:00
Alan Plum 6a0b9f0e4b
Make sure setup changes from devmode take effect 2016-07-06 14:09:09 +02:00
Alan Plum 29515d58e3
Avoid stale modules in dev mode 2016-07-06 14:09:09 +02:00
Alan Plum f1eb2ebeb8
Make installed manifests human readable 2016-07-06 14:09:09 +02:00
Alan Plum b332857bbf
app.isBroken and app.error don't exist 2016-07-06 14:09:09 +02:00
Alan Plum 2769a89c94
Move "executeScript" from FM into Service 2016-07-06 14:09:09 +02:00
Andreas Streichardt f2a418b3bc Rebuild frontend 2016-07-06 14:08:17 +02:00
Andreas Streichardt e9620b5984 fix foxx apps urls within dc/os 2016-07-06 14:07:56 +02:00
jsteemann e7833e1525 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-06 12:30:30 +02:00
jsteemann 507c7ea232 removed ascii art 2016-07-06 12:29:33 +02:00
jsteemann 6cfc0bf65b add tests for system collections 2016-07-06 12:29:21 +02:00
Andreas Streichardt 9dcdb2eeb2 Rebuild frontend 2016-07-06 11:39:18 +02:00
Andreas Streichardt 78e91447d4 Remove jshint (we are doing semistandard now) 2016-07-06 11:39:00 +02:00
Andreas Streichardt f12128f298 Only send jwt when there is one 
In DC/OS arangodb is running behind a proxy which is also doing the
DC/OS auth. when doing requests with a nulled authorization header dc/os
will send a 401 header and the images are gone
 2016-07-06 11:33:11 +02:00
jsteemann 79c3d589f5 added test for custom attributes 2016-07-06 10:02:20 +02:00
Alan Plum dacb54d56f
Don't expose graphql on context 2016-07-05 19:45:00 +02:00
Alan Plum 4b43993eda
Port express-graphql to Foxx 2016-07-05 19:38:25 +02:00
Jan Christoph Uhde e4a8b5d7b6 add --server <url> option to unittests 2016-07-05 11:30:56 +02:00
jsteemann 51ca41df62 fix startup with completely empty VERSION file 2016-07-05 10:32:10 +02:00
Frank Celler a8e29450f4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:13:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Jan Steemann 9c98cb6cf3 added test for skipLines 2016-07-04 12:15:13 +02:00
Frank Celler 325ede0676 lowered timeout 2016-07-02 15:47:45 +02:00
hkernbach 0c2e61b794 gv2 [ci skip] 2016-07-01 11:04:03 +02:00
hkernbach 1c70dcee42 merge 2016-07-01 11:02:00 +02:00
hkernbach 18907a2afa gv2 prep 2016-07-01 10:36:51 +02:00
Andreas Streichardt 6ee1f6d14a Reformat code 2016-06-30 16:57:17 +02:00
Jan Steemann 6c2f9148cc increase max. number of collections to 256 2016-06-30 13:44:31 +02:00
Andreas Streichardt 72fbc21031 Fix semistandard problems 2016-06-29 19:59:37 +02:00
Andreas Streichardt 10b4b7bcf0 testbed for reformatting 2016-06-29 19:47:18 +02:00
Andreas Streichardt 8a286a30d9 We are now using semistandard and eslint 2016-06-29 18:27:02 +02:00
jsteemann 80f774cef3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-29 17:40:52 +02:00
jsteemann 7339ff2c2c jslint 2016-06-29 17:40:46 +02:00
Alan Plum 999ca00165 Merge pull request #1903 from baslr/patch-4 
custom toJSON for FoxxContext
 2016-06-29 16:34:54 +02:00
Kaveh Vahedipour e922909d6d empty arrays handled wrong 2016-06-29 15:39:51 +02:00
Kaveh Vahedipour 4c8ae6e5c5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-29 14:59:16 +02:00
Kaveh Vahedipour 1baf2050c6 waitForCommited bug in agency fixed 2016-06-29 14:54:05 +02:00
Max Neunhoeffer 3ee7ff4aa9 Fix for synchronisation of shards logic. 2016-06-29 11:59:26 +02:00
jsteemann cd49ac415c added test 2016-06-28 13:33:40 +02:00
Mark cd932c4060 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-28 12:49:26 +02:00
Mark fb6f61ba30 shortestpath tests added 2016-06-28 12:49:05 +02:00
jsteemann 54bfd255dc added test for "collection is a nullptr" issue 2016-06-28 12:16:36 +02:00
Michael Hackstein c3084dfd0a Fixes #1831. Thank you very much for spotting this. The alias of insert was not propagated properly through the general-graph module. 2016-06-28 09:50:20 +02:00
Manuel B 1eb49ee6a1 custom toJSON for FoxxContext 
this fixes #1898
returns only documented values and hides internal values.
 2016-06-27 23:46:59 +02:00
Michael Hackstein 65c82ee38e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-27 16:57:54 +02:00
Michael Hackstein 808cb97707 Fixed a bug in SHORTEST_PATH using a distance attribute. In some cases the computed path was not correct. 2016-06-27 16:57:47 +02:00
Wilfried Goesgens 30b7244196 Give a little bit more time to wait for collections being dropped, when doing coverage. 2016-06-27 10:36:24 +02:00
hkernbach bedab04286 graph ui devel 2016-06-24 23:21:39 +02:00
Kaveh Vahedipour 6d1d1e6b0b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 15:37:08 +02:00
Kaveh Vahedipour bbade806c3 more agency tests 2016-06-24 15:36:57 +02:00
jsteemann 274801b7b6 issue #1891: renamed to OUTERSECTION 2016-06-24 14:07:41 +02:00
jsteemann daf6d42683 optimize away some more filter parts of type `"const" IN collection.attribute 2016-06-24 14:03:58 +02:00
jsteemann e0710c6fa3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-24 10:53:12 +02:00
hkernbach c490726121 ui foxx app store install fix 2016-06-24 10:51:42 +02:00
jsteemann 50c3aa93a9 issue #1891: added AQL function `DIFFERENCE` to return the symmetric difference of its input arguments 2016-06-24 10:35:49 +02:00
Wilfried Goesgens 09e4475096 disable numeric aql tests for solaris - its broken in the solaris libm. 2016-06-23 18:05:28 +02:00
Kaveh Vahedipour 761b16e407 added 'in'-check for agency precondition 2016-06-23 17:17:03 +02:00
Kaveh Vahedipour 015297c0ab minimal verbose output from agency test 2016-06-23 14:04:03 +02:00
jsteemann 7496fa2c67 issue #1894: make list of edge collections unique in traversal 2016-06-23 12:17:04 +02:00
hkernbach f9d737ebd9 query view notification bugfix 2016-06-23 11:21:30 +02:00
Kaveh Vahedipour 57d231fd42 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-23 10:48:37 +02:00
Kaveh Vahedipour b40e5a3d24 agency test waits exactly for the leader election to have ended 2016-06-23 10:48:26 +02:00
Frank Celler d8318148ca authorization is optional 2016-06-23 10:46:43 +02:00
hkernbach 30d73c2dcf removed console logs 2016-06-22 21:56:31 +02:00
hkernbach 89a47ee0a3 ui event bugfixes 2016-06-22 21:15:22 +02:00
Simran Brucherseifer edd22df7fc Aardvark: Fix label reference to actual ID 2016-06-22 12:50:42 +02:00
Wilfried Goesgens 0f18606c74 permit download of swagger json if authentication is turned of. 
This fixes #1888
 2016-06-22 10:27:35 +02:00
hkernbach 4714f539cd select2 ui 2016-06-22 01:20:10 +02:00
hkernbach 74fa793609 grunt build [ci skip] 2016-06-22 00:59:22 +02:00
hkernbach 95e9062c49 modified shards ui 2016-06-22 00:54:30 +02:00
Simran Brucherseifer 32a6dfea8a Hide native dropdown arrow in Firefox 2016-06-21 17:46:13 +02:00
hkernbach 67b3b94dbd small json ui improvement 2016-06-21 15:13:09 +02:00
hkernbach 2969c886fe ui fixed swagger json output 2016-06-21 15:08:43 +02:00
Alan Plum 5231ff4dd3
Rebuild aardvark 2016-06-21 11:34:47 +02:00
Alan Plum 82f9b024f8
Make download nonce-based 2016-06-21 11:34:37 +02:00
Alan Plum 77c96537d1
Fix failing test 2016-06-21 10:49:50 +02:00
Alan Plum 24074069f9
Finalize Router/Response.md 2016-06-21 00:13:01 +02:00
Alan Plum e77e18bbc9
Fix swagger a litle bit 2016-06-20 21:41:14 +02:00
Alan Plum ab296ac829
Check trustedProxies lazily 2016-06-20 18:57:42 +02:00
Alan Plum a0b67ae7ad
Handle false-y TRUSTED_PROXIES as null 2016-06-20 18:03:48 +02:00
Alan Plum 132a3fa387
Finalize Context.md 2016-06-20 18:02:26 +02:00
Alan Plum 50b8873d7c
More docs 2016-06-20 17:37:45 +02:00
hkernbach 116513d98d login view bugfix 2016-06-20 14:48:01 +02:00
Max Neunhoeffer 11adb777ca Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-20 00:42:00 -07:00
Max Neunhoeffer 11e3de54a1 Repair reverse proxy absolute path rewriting business. 2016-06-20 00:40:45 -07:00
Alan Plum da9035a464
Document crypto module, clean up modules appendix 2016-06-19 21:56:11 +02:00
Alan Plum c55f6df799
Finalize Router/Endpoints.md 2016-06-19 19:54:04 +02:00
hkernbach 487dbb9558 grunt build 2016-06-19 19:21:56 +02:00
hkernbach 433c636c51 fixed user permission bug in ui 2016-06-19 19:17:00 +02:00
hkernbach 1b8fe39348 fixed a web ui users bug 2016-06-19 17:45:37 +02:00
Max Neunhoeffer 50f325b4cf Fix typos. 2016-06-18 00:02:02 -07:00
Max Neunhoeffer 67bd33152b Fix typo. 2016-06-17 23:58:58 -07:00
Max Neunhoeffer aae9e92dc0 Change logic when a sync shard job is scheduled. 2016-06-17 23:57:15 -07:00
Max Neunhoeffer 7563cf56d0 Fix sync repl fix. 2016-06-17 23:18:28 -07:00
Max Neunhoeffer fe0cb0a958 Another fix for shard synchronisation. 2016-06-17 23:16:21 -07:00
Max Neunhoeffer 3bb4424b18 Wait for sync rep before dropping and recreating collection. 2016-06-17 14:18:48 -07:00
Frank Celler 11c87d247e generated 2016-06-17 21:16:42 +02:00
Max Neunhoeffer 1cf3e23575 Automatically generated error files for JS. 2016-06-17 11:56:44 -07:00
Max Neunhoeffer 01b3211048 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-17 11:02:56 -07:00
Alan Plum 8a640eb1b5
ERROR_APPLICATION_* -> ERROR_SERVICE_* 2016-06-17 20:02:25 +02:00
Max Neunhoeffer f59668e889 When recreating a collection to avoid system collections, wait for sync rep. 2016-06-17 11:02:24 -07:00
Max Neunhoeffer 3db19df169 Fix bug in syncCollectionFinalize. 2016-06-17 09:50:18 -07:00
hkernbach 8d5e38fc03 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-17 16:59:13 +02:00
hkernbach a5345fc3fc cleanup 2016-06-17 16:59:05 +02:00
hkernbach 29308720d1 frontend docu 2016-06-17 16:47:47 +02:00
Alan Plum a56aae69d4
Export foxx/mocha.findTests 2016-06-17 16:17:16 +02:00
Wilfried Goesgens 79e01ccf0e Fresh examples. 2016-06-17 15:31:32 +02:00
Alan Plum c4ed4d9df0
Make swagger docs secure again 2016-06-17 14:52:15 +02:00
Alan Plum ba2c489134
Stop swagger-ui from complaining about api key 
[skip ci]
 2016-06-17 14:51:38 +02:00
Alan Plum fd7a7c154b
More readable manifest messages 
[skip ci]
 2016-06-17 14:11:04 +02:00
hkernbach b8b9b2387c scss fix [ci skip] 2016-06-17 13:47:53 +02:00
Alan Plum 298c74d1cc
Override left offset in %dropdown-menu 
[skip ci]
 2016-06-17 13:41:58 +02:00
hkernbach 57e9f6349a ui - added state for percentage values [ci skip] 2016-06-17 13:17:22 +02:00
hkernbach d23579f507 ui fix [ci skip] 2016-06-17 12:36:20 +02:00
hkernbach 34805003fe fixed chaning collection properties in cluster 2016-06-17 11:55:08 +02:00
Frank Celler 7bcc7b33f3 removed debug log messages 2016-06-17 11:42:22 +02:00
hkernbach 70ad0867d4 shardDistribution api, shards view 2016-06-17 11:10:11 +02:00
hkernbach 101e352902 better output if no shards available 2016-06-17 10:25:31 +02:00
hkernbach 50573ff75c router fix 2016-06-17 09:57:19 +02:00
hkernbach 02fb2c2939 better handling of api documentation box size 2016-06-17 09:26:44 +02:00
hkernbach 3ab49b687d offline check recognizes 401 unauthorized [ci skip] 2016-06-17 09:10:51 +02:00
Max Neunhoeffer 6011ee4994 Repair a test by making SORT well-defined. 
There was actually a difference in a (non-guaranteed) sort order
between single server and cluster. This is fixed now.
 2016-06-16 12:02:54 -07:00
Alan Plum 5721effec7
Add missing license comment 
[skip ci]
 2016-06-16 19:53:01 +02:00
Alan Plum b289f666db
More detailed error messages in Foxx API 2016-06-16 19:52:27 +02:00
Wilfried Goesgens f7731562c3 As @afj88 points out, one can't drop a database that one is currently in. 2016-06-16 15:56:37 +02:00
Mark 0e00597e4b fixed compatibility graph functions, added tests 2016-06-16 15:39:05 +02:00
Alan Plum f593734233
Fix mounting with pathParams 2016-06-16 14:04:12 +02:00
Alan Plum 6c12b1b62d
Too eager 2016-06-16 13:51:15 +02:00
Alan Plum 16b3b59272
Fix aardvark scripts route 2016-06-16 13:48:15 +02:00
Alan Plum a70d0d75cd
Fix routing order: defaultDocument->router->files 2016-06-16 12:59:08 +02:00
Alan Plum c9be12eb37
If a param is declared make sure it is recognized 2016-06-16 12:08:57 +02:00
Alan Plum 48d1048f2d
Fix validateParam with auto path params 2016-06-16 11:54:24 +02:00
Alan Plum e880cd6ec3
trustProxy should be null by default 
If neither ArangoDB itself nor the Foxx service specify whether proxies should be trusted, the default should not be true.
 2016-06-16 11:08:37 +02:00
Alan Plum 6ef6d9fa1a
Use an actual example IP in test-utils 2016-06-16 11:08:37 +02:00
hkernbach 6a2d681fd3 fixed wrong gharial api route 2016-06-16 10:49:50 +02:00
hkernbach b6f3d506d9 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-06-16 09:56:59 +02:00
hkernbach f88c9cbfe6 css nodes fix [ci skip] 2016-06-16 09:56:49 +02:00
Mark faf599f41d erge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-16 08:21:55 +01:00
Mark 925f96d5c2 Graph: fixed weight/weightAttribute name 2016-06-16 09:21:25 +02:00
hkernbach f0ae86baca ie ajax fix 2016-06-16 08:57:56 +02:00
Max Neunhoeffer d0fe9f6d81 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-06-15 21:29:20 -07:00
Max Neunhoeffer fb19602436 Finally give system collections replication factor 2. 2016-06-15 21:28:36 -07:00
Max Neunhoeffer dab30642fa Activate statistics already after 10 seconds. 2016-06-15 21:28:14 -07:00
jsteemann 5af79e0daf jslint 2016-06-16 00:07:34 +02:00
jsteemann f6268f5c9d sort collection names 2016-06-15 23:18:04 +02:00
Simran Brucherseifer df64666cee Change name to Foxx Legacy Compatibility Mode in Aardvaark (docu) 2016-06-15 21:29:23 +02:00
Alan Plum 3a4f19e8fb
Less noise in dev mode 2016-06-15 21:07:20 +02:00
Alan Plum f403ccecf4
Log route info if error was encountered in Foxx 2016-06-15 21:07:19 +02:00
Alan Plum 564fc24472
(2.x) Don't log response type in dev mode when no body was set 2016-06-15 21:07:19 +02:00
jsteemann 490d0a88ee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 19:10:30 +02:00
jsteemann f5c2a71534 use --log.force-direct true when executing tests 2016-06-15 19:10:07 +02:00
Jan Steemann 1726c53805 fixed some import edge cases 2016-06-15 18:16:49 +02:00
Alan Plum b13c44be3a
Oops 2016-06-15 17:14:13 +02:00
Alan Plum 4b65779cc4
Add req.trustProxy, req.arangoUser, req.arangoVersion 2016-06-15 17:11:57 +02:00
Alan Plum 7c40d6d58d
Don't expose internal request user to Foxx 2016-06-15 16:32:35 +02:00
Max Neunhoeffer 8ffbf2462e Silence repliction in unit tests. 2016-06-15 16:26:47 +02:00
Max Neunhoeffer 8239ed9ea4 Slight improvement of toArgv. 2016-06-15 16:26:13 +02:00
Mark e7516f159c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-15 16:19:05 +02:00
Mark 37e99291c0 fixed compatibility functions 2016-06-15 16:18:46 +02:00
Alan Plum e6b1e0642d
Remove unused system session storage 2016-06-15 16:13:46 +02:00
Alan Plum 74db8609fb
Missed one 2016-06-15 16:13:46 +02:00
Max Neunhoeffer 2bb8e4441d Sort out waiting for sync. repl. to settle at bootstrap and create DB. 
This makes startup and creating databases slower, but leads to
a lot less trouble later on. It can now no longer happen that
a collection or database is dropped before synchronous replication
has settled.
 2016-06-15 15:25:05 +02:00
Alan Plum d9394f44e1
lodash no longer accepts thisArg 2016-06-15 15:17:58 +02:00
Alan Plum e6e0f5d655
_.functions -> _.functionsIn 2016-06-15 15:09:43 +02:00
Alan Plum 2bb8957caf
Update all dependencies to latest 2016-06-15 13:47:01 +02:00
hkernbach 927c011c17 grunt build 3.0 [ci skip] 2016-06-15 04:07:43 +02:00
hkernbach 5d7e5b1fdc support view [ci skip] 2016-06-15 02:29:15 +02:00
hkernbach ddffdf0c69 scss [ci skip] 2016-06-15 01:35:30 +02:00
hkernbach c04713c563 updated grunt dependency versions 2016-06-15 00:51:44 +02:00
hkernbach 64b67f106f grunt build [ci skip] 2016-06-15 00:38:01 +02:00
hkernbach df3121daf6 scss lint [ci skip] 2016-06-15 00:34:31 +02:00
hkernbach 41ecffcbf0 select2 collection view bugfix 2016-06-15 00:33:40 +02:00