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

11984 Commits

Author SHA1 Message Date
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