Commit graph

228 commits

Author SHA1 Message Date
kolbii
b4fd49f3cb Merge branch 'develop' of https://github.com/jc21/nginx-proxy-manager into feature/custom-locations 2019-03-04 19:56:01 +01:00
jc21
133d66c2fe
Default Site customisation and new Settings space (#91) 2019-03-04 21:19:36 +10:00
jc21
6f1d38a0e2
Fixes #88 - Allow specifying X-FRAME-OPTIONS with an environment variable (#89) 2019-03-04 10:16:46 +10:00
kolbii
9eb6e29c8c Merge branch 'develop' of https://github.com/jc21/nginx-proxy-manager into feature/custom-locations 2019-03-02 21:49:41 +01:00
Jamie Curnow
aad9ecde6b CI: Prevent having to spin up resources when not Master branch 2019-03-01 20:12:49 +10:00
Jamie Curnow
ae9324295c Merge branch 'develop' of github.com:jc21/nginx-proxy-manager into develop 2019-03-01 13:48:30 +10:00
Jamie Curnow
0acec1105b CI: Prevent having to spin up resources when not Master branch 2019-03-01 20:12:49 +10:00
Jamie Curnow
5a9a716ca6 CI: Prevent having to spin up resources when not Master branch 2019-03-01 13:47:49 +10:00
Jamie Curnow
418899d425 Version bump 2019-02-27 17:52:30 +10:00
kolbii
683e6b42a2 Merge branch 'develop' of https://github.com/jc21/nginx-proxy-manager into feature/custom-locations
# Conflicts:
#	src/backend/internal/nginx.js
#	src/backend/templates/proxy_host.conf
2019-02-25 20:03:15 +01:00
jc21
e7379e3683
Ignore default location when defined in advanced config (#79) 2019-02-25 10:42:16 +10:00
jc21
29bebcc73e
Ignore default location when defined in advanced config (#79) 2019-02-25 10:34:55 +10:00
jc21
5b7a4f77cb
Merge branch 'develop' into feature/custom-locations 2019-02-21 11:07:37 +10:00
jc21
833b97aec0
Merge branch 'develop' into feature/custom-locations 2019-02-20 14:36:10 +10:00
jc21
3dc9b20543
CI Improvements (#77) 2019-02-20 14:35:10 +10:00
jc21
62181a1d43
Merge branch 'develop' into feature/custom-locations 2019-02-20 12:30:23 +10:00
Jamie Curnow
26064b20b8 Fix PR docker image pushing to wrong repo 2019-02-20 08:25:12 +10:00
Jamie Curnow
444dbd5160 Added PR build steps to CI 2019-02-20 08:25:12 +10:00
Jamie Curnow
c2f99e253c Merge branch 'master' of github.com:jc21/nginx-proxy-manager 2019-02-20 10:04:16 +10:00
Jamie Curnow
5c7fb7b698 Added armv6 Dockerfile 2019-02-20 08:25:12 +10:00
Laszlo Ancsin
e712f028d4 Merge branch 'develop' of https://github.com/jc21/nginx-proxy-manager into feature/custom-locations
# Conflicts:
#	src/frontend/js/i18n/messages.json
2019-02-19 14:48:09 +01:00
Laszlo Ancsin
c394ca61fc Custom locations bugfix 2019-02-19 13:35:45 +01:00
Laszlo Ancsin
f44f635e5c Custom locations bugfix 2019-02-19 13:14:48 +01:00
jc21
733d7d9583
Update DOCKERHUB.md 2019-02-19 17:05:26 +10:00
Laszlo Ancsin
b04e9fa04d Custom locations: translations 2019-02-18 22:34:22 +01:00
Laszlo Ancsin
51e56c1251 Fixing proxy_host table on small screens 2019-02-18 22:09:01 +01:00
Laszlo Ancsin
920fddd961 Custom locations: refactoring 2019-02-18 22:08:32 +01:00
Laszlo Ancsin
9734b3d5c4 Custom locations: exteding config generator 2019-02-18 22:08:02 +01:00
Jamie Curnow
6d2f532806 Updated arm instructions 2019-02-18 21:14:26 +10:00
Jamie Curnow
f76c9226c8 Fix workdir perms for subsequent builds 2019-02-18 21:14:26 +10:00
Jamie Curnow
ecbc41b622 Arm64 build process doesn't run as root 2019-02-18 21:14:26 +10:00
Jamie Curnow
4f60d3e7df Fix CI now that tags are changes 2019-02-18 21:14:26 +10:00
Jamie Curnow
7d86fd223e Fix base docker images for arm packages 2019-02-18 21:12:46 +10:00
Jamie Curnow
e3ed216a70 Added arm64 build 2019-02-18 21:12:41 +10:00
Jamie Curnow
2a3d792591 Fixes #68 - HSTS is now part of the UI 2019-02-18 18:21:45 +10:00
Jamie Curnow
4d754275ab Fixes #61 - Http/2 support can now be disabled 2019-02-18 15:33:32 +10:00
Laszlo Ancsin
5fb2a08212 New feature: custom locations 2019-02-15 12:22:34 +01:00
Jamie Curnow
44e5f0957c Whoops, missing comma 2019-01-16 10:12:10 +10:00
Jamie Curnow
83ef426b93 Increased custom ssl file size limits 2019-01-16 10:11:51 +10:00
Jamie Curnow
8b8f5fac69 Updated readme and version bump 2019-01-03 21:05:00 +10:00
Jamie Curnow
424ccce43c Added disable/enable to remaining objects 2019-01-03 21:04:11 +10:00
Jamie Curnow
ad41cc985d Fix reconfigure not respecting expansions 2019-01-03 20:32:57 +10:00
Jamie Curnow
981d5a199f Initial work for disabling hosts 2019-01-03 20:27:43 +10:00
Jamie Curnow
48f2bb4cd8 Fix some ip range stuff 2019-01-03 20:25:01 +10:00
Jamie Curnow
aa270925e9 Additional nginx config for real ip determination 2019-01-03 08:18:48 +10:00
Jamie Curnow
3836f7c40a Fetch ip ranges for CDN servers, Cloudfront and Cloudfare 2019-01-03 17:04:53 +10:00
Jamie Curnow
9fcd32c2ca Fix examples to use Aria db variant 2019-01-02 12:51:01 +10:00
Jamie Curnow
2657bcf30c Revert ignoring ssl proxy errors, doesn't make a difference 2018-12-13 14:16:21 +10:00
Jamie Curnow
86ad7d6238 Fix docker build order 2018-12-13 12:20:41 +10:00
Jamie Curnow
c97e6ada5b Support for upstream ssl proxy hosts 2018-12-12 09:47:12 +10:00