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
Andreas Streichardt 3f412debf0 Revert futile attempts to implement client resilience tests 2016-08-17 18:12:40 +02:00
Andreas Streichardt 066095b74f exitStatus is now always there 2016-08-17 17:25:39 +02:00
Andreas Streichardt a90ca4e770 It finally seems to run 2016-08-17 17:25:39 +02:00
Andreas Streichardt 6aad24ab49 Self managing (instances) tests 2016-08-17 17:25:39 +02:00
jsteemann 1302439d91 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-17 16:48:11 +02:00
Alan Plum 18535e0650
Rebuild aardvark 2016-08-17 14:51:57 +02:00
Alan Plum bcb722f0ac
Add legacy mode to web interface 2016-08-17 14:51:04 +02:00
Michael Hackstein cd9a2e14b6 Fixed all single-server tests. Cluster state is not yet fixed. Still needs some internal cleanup 2016-08-17 14:43:57 +02:00
hkernbach 01a070c26e improved gv, bugfix, performance 2016-08-17 14:43:33 +02:00
Kaveh Vahedipour 77565ff626 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-17 11:13:21 +02:00
jsteemann df6d35a4bd Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-17 10:48:33 +02:00
Wilfried Goesgens 92e1580ace Revert "Disable testcases for now, it triggers the crash on windows." 
This reverts commit 5ef3742375.
 2016-08-17 09:32:30 +02:00
jsteemann a3e9ed943e Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-17 09:04:18 +02:00
hkernbach ad2273ce14 grunt build 2016-08-16 21:55:56 +02:00
hkernbach f29a8e65fc improved gv 2016-08-16 21:55:52 +02:00
Kaveh Vahedipour 96b1e8ff68 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-16 17:51:32 +02:00
jsteemann 10e855b488 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-16 16:16:07 +02:00
Alan Plum 5f7fd58056
Revert "Remove iconv-lite" 
This reverts commit c9bd40f50a.
 2016-08-16 16:08:42 +02:00
Kaveh Vahedipour 632461db33 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-16 15:46:16 +02:00
jsteemann 000fd9cbdc Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-15 18:35:43 +02:00
jsteemann 5b0bc88cc2 added tests for unary minus and plus in c++ 2016-08-15 18:17:02 +02:00
Kaveh Vahedipour 131291c2f9 single agent with uuid after fresh start 2016-08-15 17:53:01 +02:00
jsteemann f39ade10f5 jslint 2016-08-15 15:13:03 +02:00
jsteemann 209c108c59 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-15 14:34:01 +02:00
jsteemann e9cabbecb7 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache 2016-08-15 14:26:50 +02:00
jsteemann ae40ea5450 finally fixed some nasty bugs after refactoring 2016-08-15 14:26:09 +02:00
jsteemann 2780f1ec87 jslint 2016-08-15 13:41:13 +02:00
Kaveh Vahedipour 6279818369 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-15 13:14:15 +02:00
Kaveh Vahedipour 692d01638c single agent with uuid after fresh start 2016-08-15 13:13:58 +02:00
Jan Christoph Uhde 61e384e8f2 Merge remote-tracking branch 'origin/engine-vs-velocystream' into merge_jans 
* origin/engine-vs-velocystream: (54 commits)
  Fix testing
  Proper roles of servers
  Streamline agency testing
  Fix if
  Fix testing
  Improve clusterawareness in foxx and foxx queues
  Add test because of keysorting bugfix
  Couldn't query two different keys beginning with the same string in one level
  Add download and slack buttons to documentation header
  gv
  Adjustment for Repository Version
  Adjustment for Repository Version
  Adjustment for Repository Version
  Update build-repository.h.in
  improved gv
  Create build-repository.h.in
  queryView bugfix
  grunt build
  improved gv, added limit
  improved gv
  ...
 2016-08-15 08:51:38 +02:00
Simran Brucherseifer 9865adadf5 Tweak Aardvark's SUPPORT > Documentation tab 
Make links consistent with website and style it a little nicer
 2016-08-11 19:49:00 +02:00
Michael Hackstein 7b328d39e9 Merge branch 'devel' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-11 12:41:08 +02:00
Frank Celler 254a17383e generated files 2016-08-11 12:25:22 +02:00
Michael Hackstein 9c9b3a9390 Merge branch 'devel' of github.com:arangodb/arangodb into MIT 2016-08-11 11:22:21 +02:00
Michael Hackstein 374e657ae7 Fixed final cluster traverser statistic test 2016-08-11 11:22:05 +02:00
Michael Hackstein 9e22f3f902 Fixed an undefined behaviour bug and a cluster statistic for Traverser. 2016-08-10 18:06:49 +02:00
Michael Hackstein 418ed17efe Fixed Statistics-tests for graphs. We filter and scan less now if the conditions would only work on longer paths 2016-08-10 17:50:35 +02:00
Andreas Streichardt 2c8e9ba3a9 Fix testing 2016-08-10 17:23:00 +02:00
Michael Hackstein 3a95244599 Fixed ALL== and NONE== tests for graph traversals. SingleServer and cluster 2016-08-10 17:10:25 +02:00
Andreas Streichardt 784b752c8a Proper roles of servers 2016-08-10 16:30:42 +02:00
Andreas Streichardt 116a4448e3 Streamline agency testing 2016-08-10 16:10:45 +02:00
Andreas Streichardt a4d9069b9c Fix testing 2016-08-10 13:12:38 +02:00
Andreas Streichardt 87c8c0033a Improve clusterawareness in foxx and foxx queues 2016-08-10 12:26:24 +02:00
Andreas Streichardt 40cf860c0d Add test because of keysorting bugfix 2016-08-10 12:26:24 +02:00
Michael Hackstein 654dd63719 Added some more tests for ALL == and NONE == in graph traverser. Still all red. 2016-08-10 09:57:16 +02:00
Michael Hackstein 7830248fa2 Added tests for ALL== and NONE== optimisation in Traverser. Tests are RED now. 2016-08-09 17:41:01 +02:00
Michael Hackstein 3dedde1688 Fixed test for scanned index in Traverser. The cluster now is better than it was before. 2016-08-09 16:27:17 +02:00
hkernbach fcfd67a1f7 gv 2016-08-09 14:43:13 +02:00
hkernbach 9f8c068579 improved gv 2016-08-09 13:24:15 +02:00
hkernbach 9625797d09 queryView bugfix 2016-08-09 13:20:41 +02:00
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