1
0
Fork 0
Commit Graph

11907 Commits

Author SHA1 Message Date
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
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
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
jsteemann 51ca41df62 fix startup with completely empty VERSION file 2016-07-05 10:32:10 +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