Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Built-in ease-to-use reverse proxy with Cloudflare Tunnel #1427

Merged
merged 7 commits into from
Mar 30, 2022
Merged

Built-in ease-to-use reverse proxy with Cloudflare Tunnel #1427

merged 7 commits into from
Mar 30, 2022

Conversation

louislam
Copy link
Owner

@louislam louislam commented Mar 28, 2022 •
edited
Loading

Description

Despite a lot of reverse proxy methods in the world, unfortunately, none of them are actually easy-to-use in my opinion. As in the past, many Uptime Kuma users kept asking how to config a reverse proxy.

Recently, I just discovered that Cloudflare has added a web GUI for Cloudflare Tunnel which make it super easy to use. You can expose your Uptime Kuma to the Internet without so many configs!

The goal of this pr is adding the executable binary cloudflared (Debian only) into the docker image. And then you just need to provide a Cloudflare token in the Settings. Then it is ready to be browsed from the Internet.

https://www.reddit.com/r/selfhosted/comments/tp0nqg/cloudflare_has_added_a_web_gui_for_controlling/

Pros:

  • Free of charge
  • Full GUI, zero-config files
  • You can put your Uptime Kuma behind firewall
  • No need to expose your real ip
  • No need nginx, caddy, traefik etc
  • Zero-config SSL
  • Free SSL

Cons:

  • (Not a con if you are already using Cloudflare) You domain's nameserver have to move to Cloudflare.
  • add 30MB to the docker base image

Type of change

Please delete any options that are not relevant.

  • New feature (non-breaking change which adds functionality)

Checklist

  • My code follows the style guidelines of this project
  • I ran ESLint and other linters for modified files
  • I have performed a self-review of my own code and tested it
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • My code needed automated testing. I have added them (this is optional task)

Screenshots (if any)

@louislam louislam merged commit bb2b5cd into master Mar 30, 2022
ll911 added a commit to ll911/uptime-kuma that referenced this pull request Apr 27, 2022
@ll911
Squashed commit of the following:
c3a79f0 
commit d39dc944960fa9c75ee6d3b95637ff6566bd09b5
Author: Louis Lam <[email protected]>
Date:   Tue Apr 26 02:27:37 2022 +0800

    Add more info

commit 94ada36dfa62195b6414c999a0323eba3e74d0c8
Author: Louis Lam <[email protected]>
Date:   Tue Apr 26 02:20:13 2022 +0800

    Update dev guideline

commit 4114f43b489d3f2fcaf37c8132334a0e6a7e9fae
Author: Louis Lam <[email protected]>
Date:   Tue Apr 26 02:18:14 2022 +0800

    Start both dev servers in one command

commit db3ef3805b1d9152820ada6ff63f3ca994e85c32
Author: Dick Tang <[email protected]>
Date:   Mon Apr 25 08:25:06 2022 +0800

    correct wordings for Certificate Expiry Notification (#1554)

commit 751924b3355ca44d24ceede1cfdd983383426f5f
Author: Louis Lam <[email protected]>
Date:   Sun Apr 24 22:57:42 2022 +0800

    Update to 1.15.0

commit edec1024b567a7a4bf1a69a9a591d5db366f6e7d
Merge: 13a3dd9 5f9f29f
Author: Louis Lam <[email protected]>
Date:   Sun Apr 24 22:56:52 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit 5f9f29f527bec1105c3bd48e0c732a747e6b035b
Author: Louis Lam <[email protected]>
Date:   Sun Apr 24 22:54:06 2022 +0800

    Update SECURITY.md

commit 13a3dd91bb99f177a703af40ba3c1073c724b33d
Merge: 630bb03 d9c5a78
Author: Louis Lam <[email protected]>
Date:   Sun Apr 24 22:41:29 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit d9c5a7812c191db5db7eb65c69edcf1a9174c4bd
Merge: 3582e99 484d4a2
Author: Louis Lam <[email protected]>
Date:   Sun Apr 24 03:44:21 2022 +0800

    Merge pull request #1544 from mathiskir/readme-improvements

    readme improvements

commit 484d4a20abf8afc318a1307e5d7e5cb81d12a7e7
Author: Sneeex <[email protected]>
Date:   Sat Apr 23 19:29:34 2022 +0200

    Small improvements

commit 3582e997706b1f6751d80a16b6b43b4d1a843301
Merge: e6a1719 2197b98
Author: Louis Lam <[email protected]>
Date:   Sun Apr 24 01:22:56 2022 +0800

    Merge pull request #1543 from gaby/github-actions

    Upgrade to actions/checkout@v3

commit 2197b9844463e4924c89e53eaf84f07fa4c5bb24
Author: Juan Calderon-Perez <[email protected]>
Date:   Sat Apr 23 09:47:57 2022 -0400

    Upgrade to actions/checkout@v3

commit e6a1719ab421f37c54385a235c1f2709e612dedd
Author: Sneeex <[email protected]>
Date:   Fri Apr 22 09:59:34 2022 +0200

    Change notification count (#1536)

commit 7d5e7a577d1fb466d835c6343a5df9e2d0af3a1d
Merge: f1c83bb d3f0bdb
Author: Louis Lam <[email protected]>
Date:   Fri Apr 22 14:04:00 2022 +0800

    Merge pull request #1535 from Computroniks/add-jsdoc-to-contributing

    Added JSDoc requirement in contributing docs

commit 630bb03d9c84e6885dc5db1559d41efce7d52dcd
Author: Louis Lam <[email protected]>
Date:   Fri Apr 22 00:47:04 2022 +0800

    Update package-lock.json during release process

commit f1c83bb8381c7f7698449a7d87ce6e0d3a917553
Merge: 303a226 e56ac7b
Author: Louis Lam <[email protected]>
Date:   Fri Apr 22 00:06:59 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit 303a226ab76b4d6bee8b66f4b7001dab5fc12898
Author: Louis Lam <[email protected]>
Date:   Fri Apr 22 00:06:46 2022 +0800

    Update eslint rule

commit d3f0bdb440de184b42819ae04c2119505b23225c
Author: Matthew Nickson <[email protected]>
Date:   Thu Apr 21 16:30:53 2022 +0100

    Added JSDoc requirement in contributing docs

    Signed-off-by: Matthew Nickson <[email protected]>

commit e56ac7b03b44cd001f177c40e094a4eb7fbcc98d
Merge: aafcbaf 4d4d04a
Author: Louis Lam <[email protected]>
Date:   Thu Apr 21 14:37:20 2022 +0800

    Merge pull request #1530 from MrEddX/bulgarian

    Bulgarian

commit aafcbaf098232c3bd07e964091d26b49f35d6230
Author: Louis Lam <[email protected]>
Date:   Thu Apr 21 10:22:18 2022 +0800

    Update README.md

commit 4d4d04adbd8c0c38a7aa654fab0776720aaedf82
Author: MrEddX <[email protected]>
Date:   Wed Apr 20 22:01:57 2022 +0300

    Update bg-BG.js

    Some translation fixes

commit f8c9472ea24b4ab706909dac8cfbd55d016ad0c3
Author: MrEddX <[email protected]>
Date:   Wed Apr 20 21:54:57 2022 +0300

    Update bg-BG.js

    - Updated and fixed

commit 4e28ad4ac20c0d833f30e6cd90fee7bc77758d1d
Merge: 06f326e 07c0801
Author: Louis Lam <[email protected]>
Date:   Wed Apr 20 23:50:33 2022 +0800

    Merge pull request #1524 from chakflying/fix/disable-auth-icon

    Fix: Handle disabled auth in user dropdown

commit 06f326e49e93c7ee65e8df3f19c2df1a86557768
Merge: b326a69 8cefc96
Author: Louis Lam <[email protected]>
Date:   Wed Apr 20 22:43:41 2022 +0800

    Merge pull request #1527 from SiderealArt/patch-1

    Update Traditional Chinese (Taiwan) translation

commit 07c0801ad526b3f40480b0be10418e1274b5a312
Author: Louis Lam <[email protected]>
Date:   Wed Apr 20 22:39:07 2022 +0800

    Make logout button reactive, improve dropdown menu css

commit 8cefc96c783f35b47011cb59b2e6df2f49153db1
Author: SiderealArt <[email protected]>
Date:   Wed Apr 20 18:11:26 2022 +0800

    Update Traditional Chinese (Taiwan) translation

commit b326a69838236614c0b028573cf405926c8a5b48
Merge: f8f19d8 59d9891
Author: Louis Lam <[email protected]>
Date:   Wed Apr 20 17:24:36 2022 +0800

    Merge pull request #1523 from koen20/patch-1

    Update dutch translations

commit a39157628581c84b3c4186674e13a09696f7f64f
Author: Nelson Chan <[email protected]>
Date:   Wed Apr 20 15:09:31 2022 +0800

    Chore: Add translation

commit e0966e55c8b5ba97b4880e07d1d08d7382427e98
Author: Nelson Chan <[email protected]>
Date:   Wed Apr 20 15:01:13 2022 +0800

    Fix: Handle disabled auth in user dropdown

commit 59d9891105d8312ff36da153b7d18dedf4801a20
Author: Koen Habets <[email protected]>
Date:   Tue Apr 19 21:17:33 2022 +0200

    Update nl-NL.js

commit f8f19d8dc5cd668665f4a4a6d3b46782fe556383
Merge: a3d79a9 bdc23a3
Author: Louis Lam <[email protected]>
Date:   Wed Apr 20 02:57:52 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit a3d79a93e9250dfa8d27beb40c1b1f4f8001d47e
Author: Louis Lam <[email protected]>
Date:   Wed Apr 20 02:56:33 2022 +0800

    Update Apprise to 0.9.8

commit bdc23a3f5785196ddf86cff2cc7ddc1c84408db5
Merge: 7c13b1b 1892529
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 23:48:07 2022 +0800

    Merge pull request #1519 from AnnAngela/1.15.0_zh-cn

    Update en&zh-CN lang file with 1 new i18n entry

commit 7c13b1b6cb38d1220428ce5e56fc68357c211218
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 20:07:18 2022 +0800

    Update to 1.15.0-beta.1

commit 10f6a3c4f53492f93d9897e9ee50372a9e3e19c1
Merge: 200fdfb cd7c2be
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 19:59:52 2022 +0800

    Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar

    Add #1209: logout button in navbar

commit cd7c2beca6b7e343af9f10cbfaf92da127fb9fbc
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 19:46:21 2022 +0800

    Update CSS for dropdown menu

commit 8ee99760ec17a55a62a4968633eb0a8e61996df2
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 19:41:52 2022 +0800

    Minor lint

commit cb55e2371876710eef222cbd1b69ff18bec18be5
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 19:40:28 2022 +0800

    Add $root.username

commit 200fdfb808cd92a436976f62de3bbda41e75bcaa
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 16:46:45 2022 +0800

    Merge code manually since some code moved to another file

commit 29d2d95c71bf65d215a40375f620c3767b76373f
Merge: 9bf3b3a b782b25
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 16:43:13 2022 +0800

    Merge branch '1.14.X'

    # Conflicts:
    #	package.json
    #	server/server.js

commit b782b25e1796817af56b0746be8096be12411948
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 16:01:08 2022 +0800

    Update to 1.14.1

commit 919393cac9a46961b8d0c58423991f4c45c2d01d
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 15:38:59 2022 +0800

    Partially change the server core into a class, remove all require("./server") #1520

commit 18925293fbf9512ed5007d4a7c769083924bcd18
Author: AnnAngela-work <[email protected]>
Date:   Tue Apr 19 10:48:20 2022 +0800

    Update en&zh-CN lang file with 1 new i18n entry

commit 17d4003e5c620d24f453de129c0339b3ede3fa57
Author: Louis Lam <[email protected]>
Date:   Tue Apr 19 00:39:49 2022 +0800

    Add dropdown menu

commit cefb5bb60abaf85445cd4e5c8d9a4c8d65d9f036
Merge: 8860484 9bf3b3a
Author: Louis Lam <[email protected]>
Date:   Mon Apr 18 20:39:24 2022 +0800

    Merge branch 'master' into #1209-Logout-button-in-navbar

commit 9bf3b3a0f45e20b7c4207a447111af212b7676b9
Author: Louis Lam <[email protected]>
Date:   Mon Apr 18 19:15:50 2022 +0800

    Update README.md

commit e2c45f93bf8bab9f2c81f2c1f142dcce38ee9bde
Merge: 359a490 addf75d
Author: Louis Lam <[email protected]>
Date:   Mon Apr 18 19:06:39 2022 +0800

    Merge pull request #1509 from chakflying/feat/mqtt-optional-message

    Feat: Allow MQTT successMessage to be optional

commit addf75daa7dacc495ba65b8eb0ee69b1627a9623
Author: Louis Lam <[email protected]>
Date:   Mon Apr 18 19:05:14 2022 +0800

    Fix MQTT password do not save

commit 359a490ae339cdd11a8dc8731c0a93774c955fda
Author: Louis Lam <[email protected]>
Date:   Mon Apr 18 15:21:58 2022 +0800

    Fix #1510

commit cd38dd3f68ff3412844b242131f04be345dc599e
Author: Nelson Chan <[email protected]>
Date:   Mon Apr 18 13:04:55 2022 +0800

    Feat: Allow MQTT successMessage to be optional

commit f712fe85e531159c67fcc6494d136d2bf5f3736c
Author: Louis Lam <[email protected]>
Date:   Mon Apr 18 12:44:32 2022 +0800

    Update node-sqlite, sqlite from 3.36 to 3.38

commit c28b90feb4fd0b8457fc83a8e3ab5c70409e1f57
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 20:07:32 2022 +0800

    Update to 1.15.0-beta.0

commit ceba096f3ee991fa23b7e1590fa4595d86b04df1
Merge: e6a8a84 2a248ad
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 20:05:41 2022 +0800

    Merge pull request #875 from tarun7singh/master

    Added MQTT Monitor type

commit 2a248ad73f04454a6cc2a15bcd38f0e4232f2444
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 19:56:47 2022 +0800

    Change mqtt_topic from VARCHAR to TEXT

commit 5fa62a888cf4bdedb2b7f33b6bba28b8627e5a8b
Merge: 03bcf5c e6a8a84
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 19:46:33 2022 +0800

    Merge branch 'master' into mqtt2

    # Conflicts:
    #	server/database.js
    #	server/util-server.js

commit e6a8a84278677490289f3c031641b9eb47114ba4
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 19:30:58 2022 +0800

    Include only nessacary data in webhook

commit 47c72192e115a23596e8be0d4f5d248b35dbb129
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 15:43:03 2022 +0800

    [eslint] Enable yoda and eqeqeq

commit d71c0864478ba430cd7e8489152b9bb09bf41d50
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 15:27:35 2022 +0800

    Standardize array bracket spacing

commit 46e1a628a73863541130a3391b3c5455b1443c8d
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 15:04:59 2022 +0800

    Update package-lock.json

commit cd3dfd3146692fa862fe18cc6f0121231cfa4afc
Merge: 4e6ddc8 572f2b9
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 15:04:02 2022 +0800

    Merge pull request #1083 from patrickhafner/customstatuspage

    Custom status page

commit 572f2b983827b7f49cb5a3e5db68dbee5d6d0877
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 14:57:31 2022 +0800

    eslint

commit 8eb83394f74d661c51f235776255c94e17ab315f
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 14:53:13 2022 +0800

    Refine UI/UX for custom css / footer text. Add switch for show/hide powered by

commit 1bc01d10775bdb37c6cabbee230aee3b66662f2e
Merge: 81de2ee 07c474d
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 13:21:41 2022 +0800

    Merge branch 'master' into customstatuspage

    # Conflicts:
    #	src/languages/de-DE.js

commit 4e6ddc88801be544dc47af33fe173da0ad0d47db
Merge: 07c474d b7aebce
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 01:40:43 2022 +0800

    Merge pull request #1497 from MrEddX/bulgarian

    Bulgarian

commit 07c474db0b17a158db8bc952c057fbdcafdaed84
Merge: 8d8c38b 0c40e32
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 01:40:05 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit 8d8c38b1a88b9e49b6c22d95209ac9ae5e8e37e6
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 01:39:49 2022 +0800

    Allow unused vars in args and fix more eslint issues

commit 03bcf5c766fb9e642928f2e0448b62bfb457c107
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 01:07:54 2022 +0800

    Add a simple mqtt server for testing

commit 136fdf376860e3d2fd5ce8d48d9a22d8aeb62c2a
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 01:07:36 2022 +0800

    MQTT password field to password type

commit e34420368b65f4bab5b759b05d1bdbee39e5bbdb
Author: Louis Lam <[email protected]>
Date:   Sun Apr 17 01:06:47 2022 +0800

    Remove try-catch and fix username/password/port not working for mqtt

commit 566133e3505fc74c84e9b04dff7a2f425ccd9287
Author: Louis Lam <[email protected]>
Date:   Sat Apr 16 15:01:53 2022 +0800

    Domain Name Expiry Notification for https monitor only

commit 30e113755e25f6f2676508a9ca32b97a19b5daa0
Author: Louis Lam <[email protected]>
Date:   Sat Apr 16 14:50:48 2022 +0800

    Add HIDE_LOG and catch error if cannot subscribe topic

commit 083e8355b7e7282ac283960c68c8ed9055186be8
Author: Louis Lam <[email protected]>
Date:   Sat Apr 16 13:37:17 2022 +0800

    Change debug to log.debug

commit 64a0e1aa9b2d7ecba6112e90a66fcfbf403155f3
Author: Louis Lam <[email protected]>
Date:   Sat Apr 16 13:31:40 2022 +0800

    Update package-lock.json

commit b1c7915bc16c6482f007b604a4160f6ee9c20d30
Merge: 0345719 2e34141
Author: Louis Lam <[email protected]>
Date:   Sat Apr 16 13:28:39 2022 +0800

    Merge branch 'master' into mqtt2

    # Conflicts:
    #	package-lock.json
    #	package.json
    #	server/database.js
    #	server/model/monitor.js
    #	server/server.js
    #	src/pages/EditMonitor.vue

commit b7aebceaab7af25ef14656055f00c1d30f19a424
Author: Louis Lam <[email protected]>
Date:   Fri Apr 15 19:49:16 2022 +0800

    Update bg-BG.js

commit 0302fdbc961dae1fe23337c00866c40b006abddb
Author: MrEddX <[email protected]>
Date:   Fri Apr 15 13:10:14 2022 +0300

    Update bg-BG.js

    Status pages - fix

commit 84a50f058fd215cc98af6036c31edfcdc5ee5959
Author: MrEddX <[email protected]>
Date:   Fri Apr 15 13:06:22 2022 +0300

    Update bg-BG.js

commit 9ec652639bbca51d1c638b1e615ff4fbf38674c8
Merge: 1baee42 0c40e32
Author: MrEddX <[email protected]>
Date:   Fri Apr 15 13:03:34 2022 +0300

    Merge branch 'louislam:master' into bulgarian

commit 0c40e32d7572c670e88120828ae0be2184a7430e
Merge: fb00640 6f99d75
Author: Louis Lam <[email protected]>
Date:   Fri Apr 15 12:34:53 2022 +0800

    Merge pull request #1007 from chakflying/feat/save-chart-period

    Feat: Save and restore chart period

commit 6f99d7577b26a45a11b5c1a3aba1fd6da1020ff0
Author: Nelson Chan <[email protected]>
Date:   Fri Apr 15 03:24:58 2022 +0800

    Fix: Limit saved period & clear when set to recent

commit 1417b6eacf54fc70f4418629ee949c98753e7d19
Author: Nelson Chan <[email protected]>
Date:   Mon Dec 6 12:05:26 2021 +0800

    Feat: Save and restore chart period

commit 1baee42cf52c053dcad1380f7478ec88d6cc5553
Merge: 16b61db fb00640
Author: MrEddX <[email protected]>
Date:   Thu Apr 14 10:55:04 2022 +0300

    Merge branch 'louislam:master' into bulgarian

commit fb0064082ee4a301e3c1afb969e347cfd9600878
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 14:29:54 2022 +0800

    Change Pushdeer to PushDeer

commit 93c51504f93d7828674f797f06e24d3a3fcd9b95
Author: ngc7331 <[email protected]>
Date:   Wed Apr 6 08:38:48 2022 +0800

    fixes: formatting and security issues

    Co-authored-by: Matthew Nickson <[email protected]>

commit fb059f5e91bbe8ef97cc9107b3af6996b82e4b0d
Author: ngc7331 <[email protected]>
Date:   Sat Apr 2 14:40:33 2022 +0800

    Add support for Pushdeer notifications

commit 2e3414135fbf8fbe47ee7fe1adbdfc8a20958dac
Author: PhyxionNL <[email protected]>
Date:   Wed Apr 13 20:17:15 2022 +0200

    Update src/components/PingChart.vue

    Co-authored-by: Matthew Nickson <[email protected]>

commit e44699216ee21c1d052d64b27273a28771fea00f
Author: PhyxionNL <[email protected]>
Date:   Wed Apr 13 13:54:53 2022 +0200

    Fix readability of chart hover

commit fd8cba1dad83912284d56f7524815f7946e88940
Author: DX37 <[email protected]>
Date:   Mon Apr 4 22:03:44 2022 +0700

    nudge nodemailer strings; translate new ones

commit 03dd02fd38b00fc79d15b6f0968b6f3607f93b10
Author: sovushik <[email protected]>
Date:   Mon Apr 4 11:55:54 2022 +0500

    Update ru-RU.js

    Add RU for 1.14 version

commit d0b5f147e23d10f3281599ecadac39a7228ed6c2
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 10:55:41 2022 +0800

    Fix spelling and merge mistake

commit ddf8a7a692000a9bf9d21a7b6a399a97f46c8f36
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 10:43:59 2022 +0800

    Fix camelCase

commit bd9df09f8765db212eee5b34e309e1a058e80fa5
Author: ColdThunder11 <[email protected]>
Date:   Wed Feb 2 21:37:09 2022 +0800

    Apply suggestions from code review, fix style

    Co-authored-by: Adam Stachowicz <[email protected]>

commit 4656ab3d5784139ed90ea04ec53ff38989baa54d
Author: ColdThunder11 <[email protected]>
Date:   Fri Jan 28 15:02:28 2022 +0800

    Add OneBot notification service

commit 0a5db0cecbadc01d88bb0e8dff5cc10e9b77580e
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 10:12:03 2022 +0800

    Fix #1478

commit 60b44c2cddc37e8995b22ad8308e8e4f54bfdcce
Author: MrEddX <[email protected]>
Date:   Fri Mar 25 07:31:26 2022 +0200

    Update bg-BG.js

    Fixed translation.

commit 16b61dba27638d17281bd60e7a81d6c982bce81f
Merge: ae54d9c 2b0c184
Author: MrEddX <[email protected]>
Date:   Wed Apr 13 21:59:53 2022 +0300

    Merge branch 'louislam:master' into bulgarian

commit 2b0c184a88571f61a4f62980774c1e274f7077d2
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 01:21:43 2022 +0800

    Update package-lock

commit 2642e70fc89f279b8ff7dab8e3bae73c6ef5b79a
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 01:08:20 2022 +0800

    Fix auto test failed due to autocrlf

commit 8d0446dc38f9ad9d52999daae105216c721fa140
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 00:55:54 2022 +0800

    Add lint as part of test

commit 3436e26ed4350b958154a115e12875e2681ddf01
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 00:52:07 2022 +0800

    Fix styleline, fix css format issues globally

commit 649f3106e1f7b6f39d81fce9f90ab64429834553
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 00:30:32 2022 +0800

    Enforce semicolon, fix format globally

commit 6f72ca481f0d221e003a8f1fcd7fca25ebc5e2da
Merge: 670ea41 5aa747a
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 00:05:07 2022 +0800

    Merge pull request #1479 from AnnAngela/1.14.0_translation

    New translation for zh-CN

commit 670ea415b2dbd0fa0eadc78c19ff06b7d73f508f
Merge: 17dcf6d f5d006a
Author: Louis Lam <[email protected]>
Date:   Thu Apr 14 00:03:53 2022 +0800

    Merge pull request #1488 from c0derMo/update-german-translation

    updating german translation

commit 17dcf6d3a2ce32958c52862baafc436d18bfe078
Merge: 4df1477 e9ce143
Author: Louis Lam <[email protected]>
Date:   Wed Apr 13 23:47:08 2022 +0800

    Merge pull request #910 from andreasbrett/logging

    introduce consistent logging

commit e9ce1433cd3bf36f035924c1e23099ff5e4e61c9
Author: Louis Lam <[email protected]>
Date:   Wed Apr 13 23:33:37 2022 +0800

    Change log_info to log.info by making it into an object

commit f5d006add8e5e02968fe926460ccc98f7477e622
Author: c0derMo <[email protected]>
Date:   Wed Apr 13 14:45:41 2022 +0000

    updating german translation

commit 4df147786da8835d4260dde115937935bd643df1
Merge: 4053b9d 27861f0
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 22:39:29 2022 +0800

    Merge pull request #1483 from Alexandre-Gliganic/master

    Add automatic restart for docker-compose.yml

commit 27861f0d146b84d381fe8d0f3b5f6986c30e3a0f
Author: Alexandre Gliganic <[email protected]>
Date:   Tue Apr 12 16:09:01 2022 +0200

    Add automatic restart docker-compose.yml

commit 5aa747a3011aa6d8ccc2a2a69d9b4e6be1919926
Author: AnnAngela-work <[email protected]>
Date:   Tue Apr 12 20:41:25 2022 +0800

    New translation

commit 81de2eedfb596031ba4a74feb9db629f7b8c4e04
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 20:23:11 2022 +0800

    Fix template can contain one tag only, disable vue/require-component-is eslint rule

commit 4a6d7207ef31aaca52ddfac8c78d35bcdfc4c893
Merge: 3d6c52f 4053b9d
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 19:39:42 2022 +0800

    Merge branch 'master' into customstatuspage

    # Conflicts:
    #	src/languages/de-DE.js
    #	src/languages/en.js
    #	src/pages/StatusPage.vue

commit 4053b9db1fc16e38d302114e365554ad8429996d
Merge: 772d009 5ca606f
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 17:46:24 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit 772d009f4356ff9422ae0d7290896f7248d0775f
Merge: e3745da 1ba92d8
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 17:44:04 2022 +0800

    Merge branch 'master' into fluencydoc_master

    # Conflicts:
    #	extra/update-version.js
    #	server/client.js
    #	server/server.js

commit ae54d9c0110cd5c4b40cae13814bb3ba5ba220ba
Merge: a7e1a78 5ca606f
Author: MrEddX <[email protected]>
Date:   Tue Apr 12 12:37:52 2022 +0300

    Merge branch 'louislam:master' into bulgarian

commit 5ca606fe99dd6ddca0e664c30e174db6600d7aa8
Merge: 1ba92d8 6179f6c
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 17:32:52 2022 +0800

    Merge pull request #1141 from marcules/issue/1138

    Issue/1138

commit 6179f6c982bc49c34f1e09b7df5b4180f987dfec
Merge: 0bbe157 1ba92d8
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 17:15:33 2022 +0800

    Merge branch 'master' into issue/1138

    # Conflicts:
    #	server/server.js

commit 94770cf865959112499337a287d11473e1e65595
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 16:57:22 2022 +0800

    Resolve log message null reference

commit 9ec29c1bc4223f1bdf4665706c01cb739451e1f3
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 16:37:05 2022 +0800

    Add back debug() for safe, but it is marked as deprecated

commit 279e2eb3f64640645a5e8f76e672ca52f094627b
Merge: 38f8a8a 1ba92d8
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 16:32:14 2022 +0800

    Merge branch 'master' into logging

    # Conflicts:
    #	server/database.js
    #	server/jobs.js
    #	server/model/monitor.js
    #	server/routers/api-router.js
    #	server/server.js
    #	server/socket-handlers/status-page-socket-handler.js
    #	server/util-server.js

commit 1ba92d803e8113374b46f729958c2d2824936162
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 14:17:13 2022 +0800

    Update to 1.14.0

commit 45ca3085b2e2e79f8a937576dc49083c3db0e6c3
Author: Louis Lam <[email protected]>
Date:   Tue Apr 12 13:53:52 2022 +0800

    Update CONTRIBUTING.md

commit a0d1ae2cce19aaa3e2f69a4f2029c34b937f0af4
Author: Louis Lam <[email protected]>
Date:   Mon Apr 11 18:02:18 2022 +0800

    Better alignment of monitor list item

commit f030487f7d3bab7cf859ba21d0bfca3f437f9a2a
Author: Louis Lam <[email protected]>
Date:   Sun Apr 10 13:46:00 2022 +0800

    Fix theme color that do not apply to status page with a custom domain

commit 316e65d35a9ed7fa45aeaa8d638196875416d5dc
Author: Louis Lam <[email protected]>
Date:   Sun Apr 10 00:46:34 2022 +0800

    Update to 1.14.0-beta.2

commit df5ba02f3f995830027ffbe91aac924b27272803
Merge: 6a30dbd c9fa183
Author: Louis Lam <[email protected]>
Date:   Sun Apr 10 00:42:31 2022 +0800

    Merge pull request #1415 from louislam/status-page-domain

    [Status Page] Map domain names to status pages

commit c9fa183712cd611eb455dfa4afca15dfe19c7f23
Author: Louis Lam <[email protected]>
Date:   Sun Apr 10 00:25:27 2022 +0800

    Manage domain names

commit 0b9b5102ec94ab1bc6d6cba5ce90be52937abaa7
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 17:23:22 2022 +0800

    Minor

commit c399984b7f32e04ce46a120c1b19086610a11383
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 17:03:10 2022 +0800

    Improve status page sidebar

commit 0afa0be5c280eb750095206fb4096fe2a2458339
Merge: c4e74c9 6a30dbd
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 16:07:09 2022 +0800

    Merge branch 'master' into status-page-domain

    # Conflicts:
    #	server/database.js

commit 6a30dbd71aa1c8bf22157546915f7876a31995e3
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 15:44:50 2022 +0800

    Fix Mattermost when channel is empty #1468

commit a2d9474e850b1b21bb8302bba30dfe011104200b
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 14:51:26 2022 +0800

    Copy some keys from zh-TW to zh-HK

commit 8479e772cda21754277faf2530bf24cdd7a5138a
Merge: 2e50ef0 25b5ede
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 14:44:44 2022 +0800

    Merge pull request #1463 from JohnnyChiang/update-zh-TW-translation

    Update zh-TW translation

commit 2e50ef0e8ff8752da62c01560cb68a58cab2598f
Merge: 4fb2c69 511b9dd
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 14:40:38 2022 +0800

    Merge pull request #1450 from AnnAngela/1.14.0-zh_cn

    1.14.0 translation improvement

commit 4fb2c69dd1433d260bda7390e6cbd4ea21230b91
Merge: c08910a 7bbaeff
Author: Louis Lam <[email protected]>
Date:   Sat Apr 9 13:54:28 2022 +0800

    Merge pull request #1461 from louislam/proxy-improvement

    Proxy Improvements

commit c08910a65ca2e528b5f231cb3978388bddeecccf
Author: Louis Lam <[email protected]>
Date:   Fri Apr 8 19:45:39 2022 +0800

    Update README.md

commit 943c90425610b2bd29b60590b45770709e43551a
Author: Louis Lam <[email protected]>
Date:   Fri Apr 8 19:43:51 2022 +0800

    Update docker-compose.yml

commit 25b5edea7f5d65a65d61ea6f2750ebd954f324c6
Author: JohnnyChiang <[email protected]>
Date:   Fri Apr 8 01:47:01 2022 +0800

    Update zh-TW translation

commit 7bbaeffd3e7bc26f938cf8394d30aa738f87d572
Author: Louis Lam <[email protected]>
Date:   Fri Apr 8 00:56:56 2022 +0800

    Fix reset-password (issue caused by 5027fcd320fe7fbf09d8742c8f6d5e3538e2c380)

commit 008dc27f52838a1d4991e9880a71c147623b7ecd
Author: Louis Lam <[email protected]>
Date:   Thu Apr 7 23:03:45 2022 +0800

    Reload proxy settings for monitors in the monitorList

commit 5027fcd320fe7fbf09d8742c8f6d5e3538e2c380
Author: Louis Lam <[email protected]>
Date:   Thu Apr 7 23:02:57 2022 +0800

    Export server using an object class

commit d5e68f8453650c13e8348832801b1662859ce4ed
Author: Louis Lam <[email protected]>
Date:   Thu Apr 7 22:53:32 2022 +0800

    Export monitor list

commit fcb577097bc76090e5d5ac3e0fd64b634ab7d112
Author: Louis Lam <[email protected]>
Date:   Thu Apr 7 15:26:00 2022 +0800

    [Proxy] Change to radio button

commit 082c2dd32d286946609f26aaf44ab7419c329346
Author: Louis Lam <[email protected]>
Date:   Thu Apr 7 14:45:37 2022 +0800

    Remove restartMonitors() and move proxy socket events to a socket handler file

commit e89356b283516a9177bee2fdb32a962fe36c3ba2
Author: Louis Lam <[email protected]>
Date:   Thu Apr 7 14:37:33 2022 +0800

    Show proxy option for http monitor only

commit 6014b9534f1bef4313936620ff15761daeb64431
Merge: 8b45a95 ffc5bca
Author: Louis Lam <[email protected]>
Date:   Wed Apr 6 23:20:40 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit 8b45a95cc3df56fafe08370a495d7ff483516176
Merge: c9deea9 02becfd
Author: Louis Lam <[email protected]>
Date:   Wed Apr 6 23:20:22 2022 +0800

    Merge branch '1.13.X'

    # Conflicts:
    #	package.json

commit 02becfd1136ce3942920c567f6afb084bd4b86cb
Author: Louis Lam <[email protected]>
Date:   Wed Apr 6 22:54:03 2022 +0800

    Update to 1.13.2

commit 8ad992eac804cb04a70119dcbda3d8cc582bcf6a
Author: Louis Lam <[email protected]>
Date:   Wed Apr 6 22:50:21 2022 +0800

    Fix setup issue when using npm 8.6.0

commit c4e74c99430a19a4f1e36f7af9e6bd908548573c
Author: Louis Lam <[email protected]>
Date:   Wed Apr 6 22:43:22 2022 +0800

    Render <StatusPage> if domain matched

commit fee88b32e33099c4cdbb78cfcba4413a4b2b2a4a
Author: Louis Lam <[email protected]>
Date:   Wed Apr 6 20:48:13 2022 +0800

    Set PRAGMA synchronous = FULL

commit ffc5bca51df1e4a9961cddad21a5791460faa247
Author: Louis Lam <[email protected]>
Date:   Wed Apr 6 13:18:12 2022 +0800

    Update required tools' links

commit 511b9dd42548027d3345bca0686969684c246503
Author: AnnAngela <[email protected]>
Date:   Wed Apr 6 10:31:01 2022 +0800

    Update fs-rmSync.js

commit e9dd64b6f0a17057e2216de0535eefa30e4c925d
Author: AnnAngela <[email protected]>
Date:   Wed Apr 6 10:20:57 2022 +0800

    Update comments of fs-rmSync.js

commit 355aec46dcbf9839324b9a151226d489b412b323
Merge: 1ecd2e4 c9deea9
Author: Louis Lam <[email protected]>
Date:   Tue Apr 5 22:59:39 2022 +0800

    Merge branch 'master' into status-page-domain

commit c9deea9fdf8dbe0a0f96061ea75d996b47f0ce07
Merge: 70311f7 d3d1656
Author: Louis Lam <[email protected]>
Date:   Tue Apr 5 22:51:33 2022 +0800

    Merge pull request #1456 from Arubinu/alerta

    Fix "API key parameter 'undefined' is invalid"

commit 70311f7a5a64ed800fad0a7c94c6f781f16c0e85
Author: Louis Lam <[email protected]>
Date:   Tue Apr 5 21:27:50 2022 +0800

    Add an option to enable/disable the domain name expiry notification #1364

commit 4b99160b1f4b1b92345c788fd5d18ba3d69f87b0
Author: Louis Lam <[email protected]>
Date:   Tue Apr 5 19:43:23 2022 +0800

    Fix "Check Update" is not checked by default

commit 48d679234ae23faab65a51b7a031f1baadd96149
Author: Louis Lam <[email protected]>
Date:   Tue Apr 5 19:41:29 2022 +0800

    Stop bree and cloudflared while the server shutting down

commit d8b32d652ffbbe3fdebc1dcb6d6b04e77909ca53
Author: Louis Lam <[email protected]>
Date:   Tue Apr 5 16:44:55 2022 +0800

    Update .dockerignore

commit d3d1656625d033e5f64375810dca9e4f578f4229
Author: Alvin Pergens <[email protected]>
Date:   Tue Apr 5 08:47:35 2022 +0200

    Fix "API key parameter 'undefined' is invalid"

commit 8e78e62eeedc58a4bd92dfc6637f47195356e9dd
Author: AnnAngela-work <[email protected]>
Date:   Mon Apr 4 17:24:22 2022 +0800

    Make translation better

commit 706d6cee072385a4a7a30d079326eba9727ed5a8
Author: AnnAngela <[email protected]>
Date:   Mon Apr 4 11:33:02 2022 +0800

    Update some components to use i18n function, update en & zh-CN translation

commit 43eed45baeec59ba706be5b938a56593b1524a4a
Author: AnnAngela-work <[email protected]>
Date:   Sun Apr 3 22:08:24 2022 +0800

    first part of zh-CN.js translation

commit 19b7e2ba5ea45032159aee2833c5100987d4508d
Author: AnnAngela-work <[email protected]>
Date:   Sun Apr 3 22:08:03 2022 +0800

    Using grep to search `$t("foo")`-like pattern to fill up the missing part of en i18n file

commit 99042e6991e5fa7f83a333bfd603e00270b0c0af
Author: Louis Lam <[email protected]>
Date:   Sun Apr 3 22:06:39 2022 +0800

    Update to 1.14.0-beta.1

commit f54084c8883bc4d83fac09fd38d721a1dac71636
Author: Louis Lam <[email protected]>
Date:   Sun Apr 3 22:06:36 2022 +0800

    Update beta release process

commit 87d3853b8e968f55fdf0c3684586dda56c9e8118
Merge: 4738581 7fd5b61
Author: Louis Lam <[email protected]>
Date:   Sat Apr 2 18:21:12 2022 +0800

    Merge pull request #1348 from AnnAngela/master

    Detect if `fs.rmSync` is available to avoid the runtime deprecation warning

commit 4738581c66da59218df821a953606bab392991e4
Author: Louis Lam <[email protected]>
Date:   Sat Apr 2 11:34:00 2022 +0800

    Update dependencies

commit 3218a0eee80133c357a7e6995104d468372d1ed5
Merge: 87ee3c2 38e6e84
Author: Louis Lam <[email protected]>
Date:   Sat Apr 2 11:26:24 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit 87ee3c20bd88b04165cb668b9affac214c226ac9
Author: Louis Lam <[email protected]>
Date:   Sat Apr 2 11:25:27 2022 +0800

    Update proxy password field

commit 38e6e846bfc1598505233b7093fc946ef4320a64
Author: Louis Lam <[email protected]>
Date:   Fri Apr 1 23:22:15 2022 +0800

    Refresh sponsor list

commit 92ab2b12d0e62897e3f0f8e73c161eac75302450
Author: Louis Lam <[email protected]>
Date:   Fri Apr 1 17:37:04 2022 +0800

    Refresh sponsor list

commit 04e3394d02bc1b3802681477262d64481ad8a3bd
Merge: 8078d06 aef7719
Author: Louis Lam <[email protected]>
Date:   Fri Apr 1 14:57:35 2022 +0800

    Merge branch 'master' into feature/request-with-http-proxy

    # Conflicts:
    #	package-lock.json
    #	package.json
    #	server/database.js
    #	src/languages/en.js
    #	src/mixins/socket.js

commit f6cd2f60ca60521e9c36cd8c7e86b5723d39173f
Merge: aef7719 53cea7f
Author: Louis Lam <[email protected]>
Date:   Fri Apr 1 14:46:56 2022 +0800

    Merge pull request #1442 from BCsabaEngine/master

    fix: update hu lang

commit 53cea7f8d3723af13fb583d24046cd9d48d46b5a
Author: Balázs Csaba <[email protected]>
Date:   Thu Mar 31 22:25:22 2022 +0200

    fix: update hu lang

commit aef77194260454c6f4e09cb72232ebce3730be57
Merge: da32a1a 514b9fb
Author: Louis Lam <[email protected]>
Date:   Thu Mar 31 21:32:13 2022 +0800

    Merge pull request #1435 from LoaderB0T/favico

    feat: Favicon is updated based on satus page logo

commit 514b9fb68a7177782f5bc754cae3c01e5f752975
Author: Louis Lam <[email protected]>
Date:   Thu Mar 31 21:30:07 2022 +0800

    Add remark

commit da32a1aa19a0fe0c360bb1080b6c3b0b9792666a
Author: Louis Lam <[email protected]>
Date:   Thu Mar 31 16:24:28 2022 +0800

    Add uk-UA to the languageList

commit 7a69f9f56feee1c3358edd414114d9edc5bb51ca
Merge: cb6eeae c50c20f
Author: Louis Lam <[email protected]>
Date:   Thu Mar 31 16:22:29 2022 +0800

    Merge pull request #1438 from Deni7/master

    Add ukrainian translation

commit c50c20faa4aa6b7022f484345402311773f72a3b
Author: Louis Lam <[email protected]>
Date:   Thu Mar 31 16:19:04 2022 +0800

    Minor fix for uk-UA

commit cb6eeaef3471ab2c166d56b33e1f4d5c7f9d6659
Author: Louis Lam <[email protected]>
Date:   Thu Mar 31 16:15:34 2022 +0800

    Bring connection error bar to the top

commit 6674005e8b839e378e781ad60046f0d43a71d8bf
Author: Louis Lam <[email protected]>
Date:   Thu Mar 31 15:58:39 2022 +0800

    Fix storing cloudflared token while start cloudflared

commit ee3d7d8b428b82e66d6a3a2c5243307b92fb005e
Author: Denis Stepanov <[email protected]>
Date:   Wed Mar 30 23:21:09 2022 +0300

    Add ukrainian translation

commit a277cfe9e8926ea7a1805985b26b650f8f77bb35
Author: Denis Stepanov <[email protected]>
Date:   Wed Mar 30 23:16:04 2022 +0300

    Add ukrainian translation

commit 95b0df027082a51646f5a018dfef52477e66e80a
Author: Denis Stepanov <[email protected]>
Date:   Wed Mar 30 23:15:28 2022 +0300

    Add ukrainian translation

commit f02e9c44ec450c1366f58b8acd543a228f8b51f2
Author: Louis Lam <[email protected]>
Date:   Wed Mar 30 23:37:23 2022 +0800

    Update to 1.14.0-beta.0

commit bb2b5cd6ac9cb85b558fba7f9dc062886cfd285c
Merge: b8dea3a b72a2d3
Author: Louis Lam <[email protected]>
Date:   Wed Mar 30 20:15:48 2022 +0800

    Merge pull request #1427 from louislam/cloudflared

    Built-in ease-to-use reverse proxy with Cloudflare Tunnel

commit b72a2d350fa82b279182e08af33974c6414f58cb
Author: Louis Lam <[email protected]>
Date:   Wed Mar 30 20:08:26 2022 +0800

    Set cloudflared token from env var or arg

commit 71be030733bcbc582a1305ec8700cdc31571fb64
Author: Louis Lam <[email protected]>
Date:   Wed Mar 30 18:52:10 2022 +0800

    Add package-lock.json and minor words

commit 73b338bba6e4d5861f4a38baa31c72398c17f47a
Author: Janik Schumacher <[email protected]>
Date:   Wed Mar 30 12:09:38 2022 +0200

    feat: Favicon is updated based on satus page logo

commit 82ea896bbc340eec09adc80872762607bc38d276
Author: Louis Lam <[email protected]>
Date:   Wed Mar 30 11:59:49 2022 +0800

    Improve the workflow of cloudflared

commit f1f4b3b377d6c00a720fee93bf4be8ed3ac675e6
Author: Louis Lam <[email protected]>
Date:   Wed Mar 30 01:49:45 2022 +0800

    Add reverse proxy setting page for controlling cloudflared

commit a6b52b7ba633f1a8a88f16b7e64a3a51373fdff9
Merge: 44fb2a8 b8dea3a
Author: Louis Lam <[email protected]>
Date:   Tue Mar 29 17:42:55 2022 +0800

    Merge branch 'master' into cloudflared

commit b8dea3a8239f7ab53a0d4a2acd551272999d42d7
Merge: 0da6e6b 623b06e
Author: Louis Lam <[email protected]>
Date:   Tue Mar 29 17:39:12 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit 0da6e6b1fb5ee7bc687d491eb3a183061d53b418
Author: Louis Lam <[email protected]>
Date:   Tue Mar 29 17:38:48 2022 +0800

    Some improvements

commit 44fb2a88f290acec2ba750d678a6a45cee81d394
Author: Louis Lam <[email protected]>
Date:   Tue Mar 29 14:48:02 2022 +0800

    Add cloudflared socket handler

commit 623b06e33cbf9b97b784826d0af75d9aad06d607
Merge: be88351 61d0a0a
Author: Louis Lam <[email protected]>
Date:   Tue Mar 29 14:14:21 2022 +0800

    Merge pull request #1426 from DX37/translation-ru

    update russian translation

commit 7d3cbff79475c7e32818e7c77a208c94c165a0dd
Author: Louis Lam <[email protected]>
Date:   Tue Mar 29 02:24:10 2022 +0800

    [Cloudflared] Install into base docker

commit 61d0a0abce8d699a44b9df3d84c70e05586a8a57
Author: DX37 <[email protected]>
Date:   Mon Mar 28 21:16:13 2022 +0700

    update russian translation

commit 7fd5b61babcbbe6e568d7c2d8cbbe0324f52ff50
Author: AnnAngela <[email protected]>
Date:   Sun Mar 27 21:12:51 2022 +0800

    Inproperly conflict resolving

commit 96289fe014d42d2a4147d826c2d5e262b64e9d1b
Author: AnnAngela <[email protected]>
Date:   Sun Mar 27 20:56:42 2022 +0800

    Update index.js

commit 381605aca1fe80b95684fe5fbaaa8a89343f030d
Author: AnnAngela <[email protected]>
Date:   Sun Mar 27 20:55:28 2022 +0800

    Update update-version.js

commit 742c6bcaa3969e56154a1c377f8e7699ab87a31d
Merge: 88a7987 be88351
Author: AnnAngela <[email protected]>
Date:   Sun Mar 27 20:54:24 2022 +0800

    Merge branch 'master' into master

commit 88604845e67b20293a92a8d7d5d16ca0f1048fe8
Merge: 97a5b40 be88351
Author: Matthew Nickson <[email protected]>
Date:   Sun Mar 27 13:48:50 2022 +0100

    Merge branch 'master' into #1209-Logout-button-in-navbar

commit be88351eb3c98ec2a29e97cdb24756a4384cef65
Merge: 34a0b54 1bbd744
Author: Louis Lam <[email protected]>
Date:   Sun Mar 27 11:05:50 2022 +0800

    Merge pull request #1136 from chakflying/fix/prometheus-on-delete

    Fix: Remove prometheus metrics on delete [Test needed]

commit 34a0b54b93949fbe4dce7a9a0f7edafefe57b7f5
Merge: 12237de e11ea7b
Author: Louis Lam <[email protected]>
Date:   Sat Mar 26 14:11:32 2022 +0800

    Merge pull request #1418 from sovushik/patch-11

    Update ru-RU.js

commit e11ea7b0618d59dbd5bf13b020b00a4b192b6a70
Author: sovushik <[email protected]>
Date:   Sat Mar 26 10:46:07 2022 +0500

    Update ru-RU.js

    Add new string for 1.13.1

commit 12237dec6e3809404a1c84df394b232431b0f5f0
Merge: f627215 630b441
Author: Louis Lam <[email protected]>
Date:   Sat Mar 26 02:09:25 2022 +0800

    Merge remote-tracking branch 'origin/master'

commit f6272155af39efe4330aaa9f8b8f4edf8bf46c23
Author: Louis Lam <[email protected]>
Date:   Sat Mar 26 02:09:12 2022 +0800

    Show page not found for invalid routes

commit 630b441a2dfdf1e4cd1d1679afc4d1a06e8becb9
Merge: 623d03d 5922771
Author: Louis Lam <[email protected]>
Date:   Fri Mar 25 19:00:06 2022 +0800

    Merge pull request #1414 from ivanbratovic/croatian-language

    Update croatian (hr-HR) translation file

commit 1ecd2e45d058ada5c4bffedfcaa34216b09e157e
Author: Louis Lam <[email protected]>
Date:   Fri Mar 25 18:59:06 2022 +0800

    [Status Page] Plan to support domain names for status pages

commit 59227719090cf4c37cf0128836e24defebec810a
Author: Ivan Bratović <[email protected]>
Date:   Fri Mar 25 11:05:51 2022 +0100

    Update croatian (hr-HR) translation file

    Signed-off-by: Ivan Bratović <[email protected]>

commit a7e1a78ea96d3a055b205932e4223198640d3b96
Author: MrEddX <[email protected]>
Date:   Fri Mar 25 07:31:26 2022 +0200

    Update bg-BG.js

    Fixed translation.

commit 623d03dc6f3c5a1162f78ae51b536015bf2dff35
Author: Louis Lam <[email protected]>
Date:   Fri Mar 25 00:03:25 2022 +0800

    Fix release process

commit 8078d0618d076d913feb03f78673860cfec00f44
Author: Uğur Erkan <[email protected]>
Date:   Thu Nov 4 14:32:16 2021 +0300

    Add socks proxy support to proxy feature

    - Socks proxy support implemented.
    - Monitor proxy agent create flow refactored
      and moved under proxy class.

    Thanks for suggestion @thomasleveil

commit 9e27acb511a2449131e5abf4b8733b1a13826527
Author: Uğur Erkan <[email protected]>
Date:   Thu Nov 4 13:53:54 2021 +0300

    Add socks proxy agent

commit 78d76512ba7928404463ee45835ade62cc9ef804
Author: Uğur Erkan <[email protected]>
Date:   Sat Oct 30 20:37:15 2021 +0300

    Add http and https proxy feature

    Added new proxy feature based on http and https proxy agents.
    Proxy feature works like notifications, there is many proxy
    could be related one proxy entry.

    Supported features
    - Proxies can activate and disable in bulk
    - Proxies auto enabled by default for new monitors
    - Proxies could be applied in bulk to current monitors
    - Both authenticated and anonymous proxies supported
    - Export and import support for proxies

commit 2cc7a990ff44fc0ecd7561622e975b4312783c00
Author: Uğur Erkan <[email protected]>
Date:   Sat Oct 30 17:02:29 2021 +0300

    Add http and https agents

commit 88a798704b793408cab3bd80077367bf863f7c54
Author: AnnAngela <[email protected]>
Date:   Wed Mar 2 16:10:14 2022 +0800

    Update fs-rmSync.js

commit 783173fd1fa432d1c018e792e928cbf504c61f85
Author: AnnAngela-work <[email protected]>
Date:   Wed Mar 2 15:48:08 2022 +0800

    Add a helper function

commit 281fe365c056e90107fcaf3d335565e61090f098
Author: AnnAngela-work <[email protected]>
Date:   Wed Mar 2 15:23:08 2022 +0800

    Mark the version as 1.11.4 in package-lock.json

commit 97a5b400db0c575cbfd69552882750407ceffb03
Author: Computroniks <[email protected]>
Date:   Thu Jan 27 19:45:31 2022 +0000

    Added log out button to nav bar

    Implements Logout button in navbar #1209

    Signed-off-by: Computroniks <[email protected]>

commit ca89f84b9a3f28c3e78337c181e6355e732bcdfd
Author: Computroniks <[email protected]>
Date:   Thu Jan 27 18:57:14 2022 +0000

    Added sign-out-alt icon

    Signed-off-by: Computroniks <[email protected]>

commit 0345719e53ed0e7a5f7c4368584584f14e797827
Author: Tarun Singh <[email protected]>
Date:   Thu Jan 20 13:20:54 2022 -0500

    added cleartimeout in case client is already ended

commit 22256dfcd24eb7cf8545bb5ecb8f7be3370f75c4
Author: Tarun Singh <[email protected]>
Date:   Thu Jan 20 13:04:59 2022 -0500

    added timeout for removing the dead loop state

commit 227bbdea2f3a8d1e4d520b90b9d64031bcc70cff
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 12:42:34 2022 +0800

    [MQTT] Try to improve error handling

commit 6272514820ea126780efe873d70ee057470bacdf
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:53:08 2022 +0800

    [MQTT] Use existing fields instead of creating new ones (Server)

commit 1c8407a433f305a4d325667302285e27d7d4428a
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:36:55 2022 +0800

    [MQTT] Use existing fields instead of creating new ones (UI)

commit 32ec4beda082c8e7ab166b5ad15f618ef7871b4c
Merge: 9462646 2c7a701
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:24:45 2022 +0800

    Merge branch 'master' into mqtt

commit 9462646ad33eb12ad1bf14646f8999e6e690a7a4
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:22:58 2022 +0800

    Fix vulnerabilities

commit 482b3f9233f6b0ac78a1c9f6e91ffad149facea5
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:20:32 2022 +0800

    Update server/util-server.js

    Co-authored-by: Adam Stachowicz <[email protected]>

commit 6014ed11566490e6b65e161fdbcc1b89269097af
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:19:26 2022 +0800

    Fix conflict

commit bfee63452d18f80c7bc788d8b08abde2633f0c34
Merge: 076d6bd fd1fce0
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:16:58 2022 +0800

    Merge branch 'master' into mqtt

commit 076d6bdbb6392c4d5fcb44a8b99d199286b48e82
Merge: 4118de6 f9751d0
Author: Louis Lam <[email protected]>
Date:   Thu Jan 13 11:09:16 2022 +0800

    Merge branch 'master' into mqtt

    # Conflicts:
    #	package-lock.json
    #	server/database.js

commit 0bbe157099996db930294893207bad3f71ea3fae
Author: Marc Harnos <[email protected]>
Date:   Sat Jan 8 14:36:33 2022 +0100

    change parsing priority for all passed arguments

    update all passed args in server.js to prioritize command line, then use
    env.UPTIME_KUMA_ environment variables, then use the generic environment
    variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
    back to default values where applicable

commit 0053a29d103d803c22a278a861e417933241fb97
Author: Marc Harnos <[email protected]>
Date:   Fri Jan 7 23:16:26 2022 +0100

    add validation to port value parsing

    only port configurations that are valid (not isNaN) after parseInt
    are considered to be used in port variable

commit 2c8d5d28e972693af13de11bb9be5a2023eb2a8a
Author: Marc Harnos <[email protected]>
Date:   Fri Jan 7 23:13:38 2022 +0100

    simplify host fallback logic

    move decision logic for freeBSD HOST environment var into temp var

commit 1bbd744d0285bcb5bda457165221a3da97bc79d3
Author: Nelson Chan <[email protected]>
Date:   Fri Jan 7 14:29:42 2022 +0800

    Chore: Improve syntax

commit 2e0e35a1ee982ae21452035648c7f707f404498c
Author: Nelson Chan <[email protected]>
Date:   Fri Jan 7 12:34:01 2022 +0800

    Fix: Fix typo

commit 1e92487f30639343b9c0bf0cf138100d5adc4b9e
Author: Nelson Chan <[email protected]>
Date:   Fri Jan 7 12:28:08 2022 +0800

    Chore: Remove onDelete as unused

commit edd2534a1ba2fbaca5b1c00db533807646d25c7a
Author: Nelson Chan <[email protected]>
Date:   Fri Jan 7 12:26:26 2022 +0800

    Fix: Clear metrics also on stop and edit

commit f6ef390c76b282474a9f96984777576a60102e0d
Author: Nelson Chan <[email protected]>
Date:   Fri Jan 7 11:57:24 2022 +0800

    Fix: Remove Prom. metrics on delete monitor

commit 3d6c52fbea26426abfbbfb9d347046168cde9254
Merge: 9ee5914 a48176b
Author: Patrick Hafner <[email protected]>
Date:   Sat Dec 25 04:12:05 2021 +0100

    Merge branch 'master' into customstatuspage

commit 9ee591417da3fb5e7ad402be97677b2f79385605
Author: Patrick Hafner <[email protected]>
Date:   Sat Dec 25 04:09:41 2021 +0100

    Footer HTML support, updated german translation

commit 4118de6d533205e409c18e44d752e32f0a32b664
Author: Tarun Singh <[email protected]>
Date:   Thu Dec 23 19:39:47 2021 -0500

    fix protocol not defined bug

commit 3a12e209da1207fb16b4012ec8ff01a7f08f5c0b
Author: Patrick Hafner <[email protected]>
Date:   Tue Dec 21 03:55:25 2021 +0100

    Edit: editMode check before toggle

commit 2c2a824f97f012146548a2fb7cf479b2288b78cd
Author: Patrick Hafner <[email protected]>
Date:   Tue Dec 21 03:31:09 2021 +0100

    Add: en & de-DE language

commit 931ca6a3ef05483d28cf137212afc14e1eac44a9
Author: Patrick Hafner <[email protected]>
Date:   Tue Dec 21 03:27:05 2021 +0100

    Add: customize status page (css and poweredby)

commit d3c90df8a8e85f07c43ab00866f2d449c531a320
Author: Tarun Singh <[email protected]>
Date:   Sat Dec 18 16:35:18 2021 -0500

    fixed edit monitor fields empty issues

commit 38f8a8ac2fa2b44930d3979cc7e52d07f6c13358
Merge: e684712 0d69b44
Author: Andreas Brett <[email protected]>
Date:   Fri Dec 10 17:21:55 2021 +0100

    Merge branch 'louislam:master' into logging

commit e684712a77fd59222ab058f7ebb7a620f4b99ff8
Merge: dcc7856 76611ec
Author: Andreas Brett <[email protected]>
Date:   Tue Dec 7 18:21:56 2021 +0100

    Merge branch 'louislam:master' into logging

commit 5afc6a41e3afa7e003733e9dbde8d6a08f5de9d0
Author: Tarun Singh <[email protected]>
Date:   Mon Dec 6 11:28:23 2021 -0500

    removed https requirement for url

commit dcc7856b5de42f10a04c5a4fe811a3bcec6bc99f
Merge: c9b0a81 481fd3a
Author: Andreas Brett <[email protected]>
Date:   Sat Dec 4 09:59:10 2021 +0100

    Merge branch 'louislam:master' into logging

commit c9b0a81cdceb33ba665601718bc2d078a466e08a
Author: Andreas Brett <[email protected]>
Date:   Mon Nov 29 20:39:57 2021 +0100

    Update MonitorHistory.vue

commit 2f97f44086b53faf170a56d3e8de8a0ac238d7be
Author: Andreas Brett <[email protected]>
Date:   Mon Nov 29 20:37:44 2021 +0100

    Update MonitorHistory.vue

commit a13bdaac84862ca08e0eb5925129ade9fde9a6f1
Merge: ed96757 40cb22e
Author: Andreas Brett <[email protected]>
Date:   Mon Nov 29 20:32:42 2021 +0100

    Merge branch 'master' into logging

commit e3745da9863ab76c42c465dc0d14d9e6af32e246
Merge: 7179c6c 0b0fd66
Author: Fluency <[email protected]>
Date:   Tue Nov 23 10:26:45 2021 -0800

    Merge branch 'master' into master

commit 35da8c78f492c533455c712fa9802085915c03e8
Author: Tarun Singh <[email protected]>
Date:   Mon Nov 22 03:21:53 2021 -0500

    added connection timeout and refactored code

commit 7179c6cc4c4a8c33177e4d3210e5bf8542806627
Author: Fluency <[email protected]>
Date:   Fri Nov 19 10:30:31 2021 -0800

    Fix punctuation in extra/update-version.js

    Co-authored-by: Adam Stachowicz <[email protected]>

commit ed96757b2498daa8cf4498cd6b7780587914967b
Merge: 6f2dcc6 5d3bf68
Author: Andreas Brett <[email protected]>
Date:   Fri Nov 19 08:56:25 2021 +0100

    Merge branch 'louislam:master' into logging

commit 3306f4a8e0733642f6481b81fb016e277d126ffd
Author: Tarun Singh <[email protected]>
Date:   Thu Nov 18 14:03:23 2021 -0500

    removed extra logging

commit a2de9e4e361a141f2fd6b1271218a6b1bbd55095
Author: Fluency <[email protected]>
Date:   Wed Nov 17 16:02:31 2021 -0800

    Fixed export-function signature being scrambled.

commit 3f5133d1bad4bfb5c6bcc31db38ab35403e65834
Author: Tarun Singh <[email protected]>
Date:   Tue Nov 16 20:44:10 2021 -0500

    Added authentication logic

commit 6f2dcc6dd76f1d718a5a17ed21045b4f4da99df4
Author: Andreas Brett <[email protected]>
Date:   Mon Nov 15 18:07:18 2021 +0100

    using provided tsc config

commit 57bed4d6726157af3518c6a4aea0113d4481125e
Merge: df36a4b d5d957b
Author: Andreas Brett <[email protected]>
Date:   Mon Nov 15 18:04:45 2021 +0100

    Merge branch 'louislam:master' into logging

commit df36a4bb3c818f0672bb6d137a3327910a7ebbec
Author: Andreas Brett <[email protected]>
Date:   Mon Nov 15 18:02:14 2021 +0100

    console.info for level "info"

commit e5913c5abc01b9d5b9c3bef98274b52fe5640fd0
Author: Andreas Brett <[email protected]>
Date:   Mon Nov 15 17:52:28 2021 +0100

    separate log functions

commit d21f7971b585d91bac8ac226ec7f3fd7b5a9a347
Author: Andreas Brett <[email protected]>
Date:   Thu Nov 11 12:56:53 2021 +0100

    missed settings

commit bdcdf47e52938662c497f6d76e13593a06cb3f7b
Author: Andreas Brett <[email protected]>
Date:   Thu Nov 11 12:31:28 2021 +0100

    introduce consistent logging

commit f55350bebc13035e8ca54a54d84e7d8c40aec2a0
Author: Calum Bird <[email protected]>
Date:   Tue Nov 9 21:24:31 2021 -0800

    Generated documentation :)

commit 3721d11259f432fc605ee4d85051469df34ce832
Author: Tarun Singh <[email protected]>
Date:   Tue Nov 9 18:53:00 2021 -0500

    changed table column names for more specifity

commit 149015556b0da0c5434b665951060030e2272cbe
Author: Tarun Singh <[email protected]>
Date:   Thu Nov 4 22:25:29 2021 -0400

    server url changes

commit 2bcbeba3841df3618ee2b6675d0ffcdc90f498c3
Author: Tarun Singh <[email protected]>
Date:   Thu Nov 4 22:23:02 2021 -0400

    update review suggestions

    Co-authored-by: Adam Stachowicz <[email protected]>

commit d5d07da4eed12a86d3a1504c696abf9088ed6ba6
Author: Tarun Singh <[email protected]>
Date:   Thu Nov 4 22:22:53 2021 -0400

    update review suggestions

    Co-authored-by: Adam Stachowicz <[email protected]>

commit 2d802585ffb99d02db2e253fff3c233a5e07376c
Author: Tarun Singh <[email protected]>
Date:   Thu Nov 4 22:21:54 2021 -0400

    Update review suggestions

    Co-authored-by: Adam Stachowicz <[email protected]>

commit 6828e8ef6d6235075a1ffa5a3c74287487cf2ee4
Merge: 670754b 82cde7c
Author: Tarun Singh <[email protected]>
Date:   Wed Nov 3 21:47:44 2021 -0400

    Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma

commit 670754b697282f699efd7036696762807f3b61a0
Author: Tarun Singh <[email protected]>
Date:   Wed Nov 3 21:46:43 2021 -0400

    added MQTT monitor type
@snyk-bot snyk-bot mentioned this pull request Jan 27, 2023
Merged
@thefourcraft thefourcraft mentioned this pull request Feb 23, 2023
Closed
@snyk-bot snyk-bot mentioned this pull request Apr 1, 2023
Open
@louislam louislam deleted the cloudflared branch August 18, 2023 05:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@louislam