jc21
6694a42270
Merge pull request #560 from jlesage/remove-from-unixtime
...
Removed usage of `FROM_UNIXTIME` mysql-specific function.
2020-08-21 14:21:40 +10:00
Jocelyn Le Sage
83fad8bcda
Removed usage of FROM_UNIXTIME
mysql-specific function.
...
This provide better interoperability with different databases (e.g. sqlite).
Fixes #557
2020-08-14 19:31:05 -04:00
Jamie Curnow
5d65166777
Ignore local subnets for real IP determination
2020-08-12 09:32:40 +10:00
jc21
d68656559c
Merge pull request #544 from jlesage/sqlite-now-helper-fix
...
Fixed now_helper for sqlite (time is missing)
2020-08-07 08:37:00 +10:00
Jocelyn Le Sage
01660b5b80
Fixed now_helper for sqlite: it should also returns the time.
2020-08-06 17:16:22 -04:00
Jamie Curnow
7c7d255172
Added another contributor
2020-08-06 14:46:19 +10:00
jc21
058f1e9835
Merge pull request #464 from vrenjith/patch-1
...
Update location-item.ejs - forward_host size increase to 200
2020-08-06 14:45:09 +10:00
Jamie Curnow
b4fc629ec0
Bumped version
2020-08-06 14:43:34 +10:00
Jamie Curnow
ae06b2da75
Updated deps and added contributor
2020-08-06 14:40:54 +10:00
Jamie Curnow
54d423a11f
Updated doc for sqlite
2020-08-06 14:27:29 +10:00
Jamie Curnow
5da6c97a00
Pull cypress tests from correct location
2020-08-06 13:57:33 +10:00
Jamie Curnow
bf2f13443f
Cypress fixes
2020-08-06 12:47:24 +10:00
Jamie Curnow
9ce4c3fe2f
CI fix
2020-08-06 12:02:47 +10:00
Jamie Curnow
4a07bf666d
Added users cypress tests
2020-08-06 11:57:31 +10:00
Jamie Curnow
5be46b4b20
Cypress fixes
2020-08-06 11:26:37 +10:00
Jamie Curnow
7fd825b76b
Use development config file in CI
2020-08-06 10:59:25 +10:00
Jamie Curnow
b23d59dec7
Updated cypress to 4.12.1
2020-08-06 09:00:52 +10:00
Jamie Curnow
492d450d26
Sqlite Tweaks
...
- Added cypress testing in CI for sqlite
- Cleaned up promises in setup
- Ensure check for settings is strict
2020-08-06 08:58:20 +10:00
jc21
04412f3624
Merge pull request #510 from tg44/multidb-re
...
Multidb - sqlite support
2020-08-06 08:33:00 +10:00
Jamie Curnow
c41057b28a
Revert builx push experiment
2020-07-31 09:28:45 +10:00
Jamie Curnow
8312bc0100
Use same tags for experiment
2020-07-30 14:00:59 +10:00
Jamie Curnow
85ac43bc5e
Merge branch 'master' of github.com:jc21/nginx-proxy-manager into develop
2020-07-30 08:31:18 +10:00
Jamie Curnow
d1a0780c7a
Attempt to circumvent docker login token timeouts
2020-07-30 08:30:26 +10:00
jc21
f9b8d76527
Merge pull request #513 from jc21/dependabot/npm_and_yarn/frontend/lodash-4.17.19
...
Bump lodash from 4.17.15 to 4.17.19 in /frontend
2020-07-20 12:39:10 +10:00
jc21
26f00eeae4
Merge branch 'master' into dependabot/npm_and_yarn/frontend/lodash-4.17.19
2020-07-20 10:59:15 +10:00
jc21
1bc2df2178
Merge pull request #514 from jc21/dependabot/npm_and_yarn/docs/lodash-4.17.19
...
Bump lodash from 4.17.15 to 4.17.19 in /docs
2020-07-20 10:58:36 +10:00
dependabot[bot]
8dfbcef198
Bump lodash from 4.17.15 to 4.17.19 in /docs
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-19 20:33:49 +00:00
Gergo Torcsvari
6690b7735d
sqlite3 and psql support
2020-07-19 20:04:29 +02:00
Gergo Torcsvari
a9e7222e5e
introduced now_helper for multidb capabilities
2020-07-19 20:03:53 +02:00
Gergo Torcsvari
f8edeb2775
fixed migration and setup
...
more info: https://github.com/knex/knex/issues/2820
2020-07-19 20:02:20 +02:00
dependabot[bot]
d1786fe159
Bump lodash from 4.17.15 to 4.17.19 in /frontend
...
Bumps [lodash](https://github.com/lodash/lodash ) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases )
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-07-19 15:20:28 +00:00
vrenjith
157a12fb7c
Update location-item.ejs
2020-06-19 01:56:16 +05:30
jc21
3f723b1638
Merge pull request #454 from jc21/develop
...
v2.3.1
2020-06-09 09:47:31 +10:00
Jamie Curnow
e2e9835d01
Version bump
2020-06-09 09:17:25 +10:00
jc21
7599617b67
Merge pull request #452 from jc21/dependabot/npm_and_yarn/docs/websocket-extensions-0.1.4
...
Bump websocket-extensions from 0.1.3 to 0.1.4 in /docs
2020-06-08 11:14:20 +10:00
dependabot[bot]
18a5b11033
Bump websocket-extensions from 0.1.3 to 0.1.4 in /docs
...
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node ) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases )
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md )
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-06-07 23:36:47 +00:00
Jamie Curnow
fff31b0f34
Ensure we're using the latest node image
2020-06-03 10:30:29 +10:00
Jamie Curnow
c02e30663a
Revert last
2020-06-02 20:21:27 +10:00
Jamie Curnow
4c6527cafc
Ensure python2 is installed for frontend build
2020-06-02 20:09:27 +10:00
jc21
55bddb12e5
Merge pull request #435 from Subv/access_lists_ips
...
Don't use duplicate relations when eager-loading access list items and clients.
2020-06-02 19:42:27 +10:00
Subv
d95861e1fb
Don't use duplicate relations when eager-loading access list items and clients.
...
This fixes an Objection warning: 'Duplicate relation "proxy_hosts" in a relation expression. You should use "a.[b, c]" instead of "[a.b, a.c]". This will cause an error in objection 2.0'.
It also fixes the access list clients not being properly eager-loaded when building the proxy host nginx configuration files. Closes #434
2020-05-29 20:29:34 -05:00
Jamie Curnow
94754a5cb3
Revert CI debug
2020-05-28 20:26:16 +10:00
jc21
546f862236
Merge pull request #429 from jc21/develop
...
v2.3.0
2020-05-28 17:06:19 +10:00
jc21
f105e29e56
Merge branch 'master' into develop
2020-05-28 15:38:38 +10:00
Jamie Curnow
5c15993d06
Contributors 7 wide
2020-05-28 13:31:41 +10:00
Jamie Curnow
a369ea1080
Bump version
2020-05-28 13:29:55 +10:00
Jamie Curnow
98068c0f57
Debug CI by leaving images alive
2020-05-28 13:26:36 +10:00
jc21
e0ef8683a2
Merge pull request #428 from jc21/openresty
...
Openresty base
2020-05-28 12:22:31 +10:00
Jamie Curnow
66412a75f9
Revert to node base now that base has openresty
2020-05-28 09:25:29 +10:00
jc21
84d8fb0899
Merge pull request #403 from Indemnity83/empty-auth
...
Don't ask for username/password if none are defined
2020-05-28 09:18:50 +10:00