Cut staging from master #823

Merged
skhameneh merged 24 commits from master into staging 2018-12-14 23:53:07 +01:00

24 commits

Author SHA1 Message Date
jessopb
bf2a52ba67
Merge pull request #822 from lbryio/revert-820-fourohfour2
Revert "Sets proper 404 status in most cases"
2018-12-14 17:43:50 -05:00
jessopb
dbddf06ff5
Revert "Sets proper 404 status in most cases" 2018-12-14 17:10:12 -05:00
Shawn K
fedea718b8
Merge pull request #820 from jessopb/fourohfour2
Sets proper 404 status in most cases
2018-12-14 01:51:22 -06:00
jessop
d38d8f1061 Sets proper 404 status in most cases 2018-12-13 22:43:03 -05:00
Shawn K
c28d45515b
Merge pull request #817 from lbryio/travis-ci
Travis ci
2018-12-10 00:24:50 -06:00
Shawn
2b3cd54f30 Fix test authConfig.json 2018-12-10 00:20:39 -06:00
Shawn
22cfb33409 Consolidate jobs because Travis does not handle them well 2018-12-10 00:17:47 -06:00
Shawn
8651476242 Attempt to fix travis cache error 2018-12-10 00:12:14 -06:00
Shawn
39bd8d43fe Define script for setup to disable automatic tests during setup 2018-12-10 00:09:11 -06:00
Shawn
d3741c5da1 Adjust build order 2018-12-10 00:04:34 -06:00
Shawn
997e909117 Fix YAML formatting 2018-12-10 00:00:32 -06:00
Shawn
68f7eb11b5 Adjust configuration before build 2018-12-09 23:54:17 -06:00
Shawn
341b9e3a5f Adjust configuration before build 2018-12-09 23:47:15 -06:00
Shawn
31a65f566e Add test environment setup 2018-12-09 23:44:00 -06:00
Shawn
105282b6a3 Migrate to jobs 2018-12-09 23:29:23 -06:00
Shawn
4684e28fdb Revert "run eslint pre-hook"
This reverts commit 7391df8e84.
2018-12-09 23:18:39 -06:00
Niko Storni
81cc5a8323 add travis 2018-12-09 23:16:32 -06:00
Niko Storni
7391df8e84 run eslint pre-hook 2018-12-09 23:16:28 -06:00
Shawn K
ae0ccb8b50
Merge pull request #816 from jessopb/editdocs
clarity changes to docs
2018-12-09 20:19:58 -06:00
jessop
596a4b70a3 clarity changes to docs 2018-12-09 17:55:00 -05:00
Shawn K
c299d369b0
Merge pull request #814 from jessopb/permanentURIs
bugfixes around display of permanentURIs
2018-12-06 20:57:25 -06:00
Shawn K
c371550bf2
Merge pull request #812 from jessopb/CORS
adds CORS headers to serveFile
2018-12-06 20:55:33 -06:00
jessop
20dc54ba05 bugfixes around display of permanentURIs 2018-12-06 21:28:28 -05:00
jessop
d8a2903e65 adds CORS headers to serveFile 2018-12-05 14:54:14 -05:00