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

12273 Commits

Author SHA1 Message Date
hkernbach 90e1ad30c6 grunt build 2016-08-09 13:14:22 +02:00
hkernbach 402af033a6 improved gv, added limit 2016-08-09 13:09:24 +02:00
hkernbach ff36c35f2d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-09 12:55:47 +02:00
hkernbach 71aca42713 improved gv 2016-08-09 12:55:39 +02:00
Wilfried Goesgens b106a876b7 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2016-08-09 09:26:09 +02:00
Wilfried Goesgens 5ef3742375 Disable testcases for now, it triggers the crash on windows. 2016-08-09 09:25:30 +02:00
hkernbach 3278db960f improved gv 2016-08-09 09:05:54 +02:00
Michael Hackstein 8225cf9e10 Fixed syntax error in graph-traverser 2016-08-08 17:42:01 +02:00
Michael Hackstein 5d33d3d061 Fixed vpack-externals test. It now states WITH in cluster. 2016-08-08 17:41:22 +02:00
Michael Hackstein 5fcf95a67e Fixed test for rule optimize traversals. 2016-08-08 17:35:42 +02:00
Michael Hackstein e2ba840577 Fixed aql-graph suite in cluster. It now uses WITH statements. 2016-08-08 17:35:20 +02:00
Michael Hackstein bb5a9442a5 Fixed test suite. 2016-08-08 17:06:43 +02:00
Michael Hackstein b66d9ea445 General Graph functions with edgeRestrictions now properly inject WITH <vertexCollections>. 2016-08-08 16:29:02 +02:00
hkernbach fa545e7c5f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-08 15:14:02 +02:00
hkernbach ff0d390239 improved pr 2016-08-08 15:12:13 +02:00
Jan Christoph Uhde 0e5b455159 setPayload of response now takes contType instead of request 2016-08-08 14:48:56 +02:00
Simran Brucherseifer 7437c492de Improve Aardvark tooltips for index creation 2016-08-08 14:08:29 +02:00
Michael Hackstein bf435219dc Adopted many graph tests to now properly use WITH to make sure all collections are locked properly. Will add a test for correct behaviour without WITH later. 2016-08-08 12:38:40 +02:00
hkernbach c5348ba1a1 Merge branch 'upstream/#1906' of https://github.com/bateramos/arangodb into bateramos-upstream/#1906 2016-08-08 12:21:14 +02:00
Alan Plum e04d9d6571
Setter must return true on success 2016-08-05 17:54:37 +02:00
Jan Steemann ed475b698b fixed failing test 2016-08-05 17:43:11 +02:00
jsteemann 0ceccf6370 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-05 16:23:30 +02:00
Jan Steemann cb4b091301 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-05 16:18:24 +02:00
Jan Steemann e69e49f145 fix Buffer array access 2016-08-05 14:50:06 +02:00
Jan Christoph Uhde c423e9f91d restructure test 2016-08-05 12:24:02 +02:00
Andreas Streichardt 9662d6cb7c Fix strange naming 2016-08-05 11:35:56 +02:00
Jan Christoph Uhde 1d0810b0cc better spacing for unittest output 2016-08-05 10:04:13 +02:00
Jan Christoph Uhde 90388f4e72 fix test - use substrings instead of exact match 2016-08-04 23:31:53 +02:00
Jan Christoph Uhde 0fcbb58b11 update test --jslint is failing vecause of VPACK_TO_V8 2016-08-04 23:24:43 +02:00
Jan Christoph Uhde 0bcbe92433 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream 
* origin/engine-vs-velocystream: (95 commits)
  move it a class method
  speed up compaction and cleanup a bit
  privatization
  added functions V8_TO_VPACK and VPACK_TO_V8
  fixed compaction bug
  fixed compaction bug
  raft testing revealed performance optimisation in receiver and of appendentries
  more streamlining, links to the UDF documentation.
  refactoring
  By simran: review UDF documentation.
  Explain clustering impacts in the optimizer chapter.
  fixed tests
  WG beautification
  Remove iconv-lite
  Add iconv-lite and timezone
  Add missing package description file.
  compaction bug in agency
  compaction bug in agency
  compaction bug in agency
  fixed compaction bug
  ...
 2016-08-04 18:48:51 +02:00
Jan Christoph Uhde 50fe64d6ca convert contentTypes 2016-08-04 16:42:30 +02:00
Jan Christoph Uhde 3c4db6783c update test 2016-08-04 15:02:04 +02:00
jsteemann bc6633e4c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 13:33:10 +02:00
jsteemann 5d640b7144 fixed tests 2016-08-04 13:32:54 +02:00
Jan Christoph Uhde 01c1c09d5a add first vpack test -- content type has to be fixed first 2016-08-04 13:32:25 +02:00
Michael Hackstein 8cb670595b Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-04 09:09:25 +02:00
Alan Plum c9bd40f50a
Remove iconv-lite 
Apparently iconv-lite doesn't work with the new buffers, even in Node.js.
 2016-08-03 15:53:11 +02:00
Alan Plum 742bb39f7c
Add iconv-lite and timezone 2016-08-03 15:47:07 +02:00
jsteemann ac1e4c1ef7 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-03 14:43:56 +02:00
Kaveh Vahedipour 6b3fb28b30 compaction bug in agency 2016-08-03 14:34:23 +02:00
jsteemann 8baa7ec955 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-03 13:39:00 +02:00
Wilfried Goesgens 799ccbc765 Merge pull request #1976 from de3/devel 
Error when job retried: Cannot convert object to primitive value
 2016-08-03 12:53:35 +02:00
jsteemann 2256ffd5b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-03 10:52:03 +02:00
Jan Steemann 5b4e4e0845 issue #1977 2016-08-03 09:56:13 +02:00
Edi 2a758b0600 Error when job retried: Cannot convert object to primitive value 2016-08-03 12:46:40 +07:00
Michael Hackstein 2214c57821 Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-02 13:02:24 +02:00
jsteemann 10341eafdb Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-02 09:42:17 +02:00
Michael Hackstein 994a99e31f Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-01 16:50:54 +02:00
Wilfried Goesgens ad0bc4d00f Work on the debian build 
- change 3.0.x-devel to be 3.0.devel since minus or underscore collide with packaging requirements
  - re-sync package scripts with whats current on suse OBS
  - add config-uid support.
 2016-08-01 13:43:30 +02:00
Andreas Streichardt 6f156d8554 Fix foxx issues in cluster 
Bootstrap will now be done on the bootstrap coordinator.

queues will now be executed by the "foxxmaster"
 2016-08-01 13:43:30 +02:00
jsteemann 80f1a7aaee Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-29 17:16:20 +02:00
Andreas Streichardt 526c8f42c2 Fix foxx issues in cluster 
Bootstrap will now be done on the bootstrap coordinator.

queues will now be executed by the "foxxmaster"
 2016-07-29 16:06:31 +02:00
Max Neunhoeffer 4bc433d5a7 Fix bug in synchronous replication. 2016-07-29 11:29:05 +02:00
jsteemann de4eb8510c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-29 08:56:34 +02:00
hkernbach 04bac349df grunt build [ci skip] 2016-07-28 21:39:00 +02:00
hkernbach f2a51a7db5 gv - better edge error handling 2016-07-28 21:07:07 +02:00
hkernbach 1c387cbda1 gv - some graph results could not be rendered 2016-07-28 20:17:09 +02:00
hkernbach 882f5bac4b fixed a gv starting point issue 2016-07-28 20:00:02 +02:00
hkernbach 35c1a868e5 gv - fixed lasso tool issue 2016-07-28 19:28:24 +02:00
hkernbach 1e68943aa0 gv - document editor bugfix 2016-07-28 19:17:18 +02:00
hkernbach bd1dd5e022 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-28 18:52:23 +02:00
hkernbach 20ff78276a fixed gv ui issue 2016-07-28 18:51:58 +02:00
Andreas Streichardt 46817601e4 Remove obsolete actions (cluster 3.0 made them obsolete) 2016-07-28 18:46:37 +02:00
hkernbach 92016c52fb gv - fixed wrong attr titles [ci skip] 2016-07-28 18:28:29 +02:00
hkernbach 2b5e336685 gv - fixed firefox ui issues 2016-07-28 18:25:17 +02:00
jsteemann ba6bb338ba Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-07-28 17:25:19 +02:00
Jan Steemann ddecc740e6 fixed issue in `INTERSECTION` AQL function with duplicate elements in the source arrays 2016-07-28 17:11:21 +02:00
hkernbach 9f3b7a9080 fixed broken downloads in firefox, issue: #1968 2016-07-28 16:53:31 +02:00
jsteemann b48779c821 fixed tests 2016-07-28 15:56:38 +02:00
Andreas Streichardt c34a02cf20 Improve error handling 2016-07-28 12:05:51 +02:00
Andreas Streichardt d5e2bd8987 Fix ssl tests (CORS) 2016-07-28 11:52:53 +02:00
Andreas Streichardt 0118b15f1c Fix testing.js 2016-07-27 17:14:15 +02:00
Andreas Streichardt 738344bb67 Wow...fix conflict 2016-07-27 13:34:19 +02:00
Andreas Streichardt 8c0cb81a77 Fix trusted origin tests 2016-07-27 12:10:47 +02:00
hkernbach 065dc57a8a grunt build [ci skip] 2016-07-26 22:13:29 +02:00
hkernbach 79e433736e improved gv 2016-07-26 21:35:14 +02:00
hkernbach 432ae0a55e added expand function to gv 2016-07-26 21:26:49 +02:00
hkernbach 1a31731ab8 semistandard fix 2016-07-26 20:10:33 +02:00
hkernbach 7d7220ea95 improved gv 2016-07-26 20:06:54 +02:00
hkernbach ba9f777142 gv bugfix 2016-07-26 19:34:44 +02:00
hkernbach d87cd66cdd improved gv 2016-07-26 19:22:32 +02:00
hkernbach c3e1184466 improved gv performance 2016-07-26 16:40:41 +02:00
hkernbach de62f7f673 fixed query editor issues 2016-07-26 15:51:08 +02:00
hkernbach 7601b12364 grunt build [ci skip] 2016-07-26 13:36:43 +02:00
hkernbach 40514e85ba gv improvements 2016-07-26 13:36:31 +02:00
Michael Hackstein 2a9c8ddc77 Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-07-26 09:43:48 +02:00
jsteemann b83e83e39b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-07-25 17:57:36 +02:00
jsteemann d6baadf59a fix recovery edge case 2016-07-25 17:57:25 +02:00
hkernbach cf5d27257d grunt build [ci skip] 2016-07-25 17:57:04 +02:00
hkernbach b067f71df5 added edge hover event 2016-07-25 17:52:34 +02:00
hkernbach a614a71b4b redirect to new gv 2016-07-25 17:45:08 +02:00
hkernbach 4f171936fa ui added query execution of selected text 2016-07-25 17:29:45 +02:00
hkernbach 6214b02701 gv improvements 2016-07-25 17:12:24 +02:00
hkernbach 5dce34b9f8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-25 14:17:51 +02:00
hkernbach be6bfe7aea gv improvement + bugfix 2016-07-25 14:17:39 +02:00
Jan Steemann 44059b5feb issue #1959 2016-07-25 11:37:24 +02:00
hkernbach 5bd38bf2cc fixed exporting documents webui 2016-07-25 10:58:06 +02:00
Michael Hackstein db4746f85e Now V8 conditions in Graph Traversals are not optmized any more. 2016-07-25 10:16:43 +02:00
Michael Hackstein 2d22afd4ea Fixed tests in Traversal. SingleServer all simple conditions are working and optimized. It does not yet work if one of the conditions requires v8 or a Variable. 2016-07-25 09:49:48 +02:00
hkernbach c4d623001c grunt build [ci skip] 2016-07-22 23:42:51 +02:00
hkernbach 2b0ce1b892 improved gv 2016-07-22 22:13:27 +02:00
hkernbach fe4268b759 fixed landscape smartphone navigation bug, improved login screen css 2016-07-22 22:12:27 +02:00
hkernbach 00f37ba3d2 improved code modal output 2016-07-22 21:46:36 +02:00
hkernbach b605b4b395 updated font awesome to version 4.6.3 2016-07-22 21:32:42 +02:00
hkernbach 7924ce27ab version check improved 2016-07-22 21:06:45 +02:00
hkernbach b74437716b fixed issue: #1881 2016-07-22 20:36:54 +02:00
hkernbach bbf5aa6899 documents view, now able to remove first filter element 2016-07-22 20:06:11 +02:00
hkernbach b6190df925 support view 2016-07-22 17:33:27 +02:00
hkernbach 2e7123ceee gv improvements 2016-07-22 14:29:22 +02:00
hkernbach 43262197cc grunt build [ci skip] 2016-07-22 13:00:00 +02:00
hkernbach 9d72233cda Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-07-22 12:56:47 +02:00
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