github
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma
1
0
Fork 0
Code Issues Releases Wiki Activity
2,787 Commits
41 Branches
120 Tags
40 MiB
Commit Graph

189 Commits (f570d41142886ad57bf506a2fffe5d7bfb8beef9)

Author SHA1 Message Date
Louis Lam 04e22f17a9 Merge remote-tracking branch 'origin/master' into christopherpickering_master 
# Conflicts:
#	package-lock.json
#	src/languages/en.js
 2022-06-11 20:59:58 +08:00
Marc Hagen 5830f1e0b5 [feat] Adding PagerDuty notification 2022-05-25 14:10:31 +02:00
Louis Lam 35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port 
Added #1059: Allow to specify Resolver Port for DNS Monitor
 2022-05-25 14:59:14 +08:00
Christopher Pickering 87f933df4f
added sqlserver monitor 2022-05-12 12:48:03 -05:00
AnnAngela-work 7dd5f5ea0d Improve translation 2022-04-29 20:26:56 +08:00
AnnAngela-work 45da7c5431 Improve translation work 2022-04-29 20:17:15 +08:00
Matthew Nickson d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port 2022-04-24 01:06:45 +01:00
Nelson Chan a391576285 Chore: Add translation 2022-04-20 15:09:31 +08:00
AnnAngela-work 18925293fb Update en&zh-CN lang file with 1 new i18n entry 2022-04-19 10:48:20 +08:00
Louis Lam 5fa62a888c Merge branch 'master' into mqtt2 
# Conflicts:
#	server/database.js
#	server/util-server.js
 2022-04-17 19:46:33 +08:00
Louis Lam 8eb83394f7 Refine UI/UX for custom css / footer text. Add switch for show/hide powered by 2022-04-17 14:53:13 +08:00
Louis Lam 1bc01d1077 Merge branch 'master' into customstatuspage 
# Conflicts:
#	src/languages/de-DE.js
 2022-04-17 13:21:41 +08:00
Louis Lam b1c7915bc1 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
 2022-04-16 13:28:39 +08:00
Louis Lam fb0064082e Change Pushdeer to PushDeer 2022-04-14 14:34:30 +08:00
ngc7331 93c51504f9 fixes: formatting and security issues 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-14 14:34:30 +08:00
ColdThunder11 4656ab3d57 Add OneBot notification service 2022-04-14 10:58:28 +08:00
Matthew Nickson 8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port 2022-04-13 21:24:04 +01:00
Matthew Nickson b893d50e45
Implement specify Port for DNS Monitor #1059 
This commit should fully implement #1059. When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-13 21:02:19 +01:00
AnnAngela-work 5aa747a301 New translation 2022-04-12 20:41:25 +08:00
Louis Lam 4a6d7207ef Merge branch 'master' into customstatuspage 
# Conflicts:
#	src/languages/de-DE.js
#	src/languages/en.js
#	src/pages/StatusPage.vue
 2022-04-12 19:39:42 +08:00
AnnAngela-work 8e78e62eee Make translation better 2022-04-04 17:24:22 +08:00
AnnAngela 706d6cee07
Update some components to use i18n function, update en & zh-CN translation 2022-04-04 11:33:02 +08:00
AnnAngela-work 19b7e2ba5e Using grep to search `$t("foo")`-like pattern to fill up the missing part of en i18n file 2022-04-03 22:08:03 +08:00
Louis Lam 04e3394d02 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
 2022-04-01 14:57:35 +08:00
Louis Lam 37be7df9b0 [Status Page] Delete status page 2022-03-18 15:19:52 +08:00
Louis Lam 50d6e888c2 [new status page] wip 2022-03-10 21:34:30 +08:00
Louis Lam ae14ad5a84 Add a word "Status Pages" 2022-03-09 22:14:07 +08:00
Uğur Erkan 78d76512ba 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
 2022-03-06 19:34:49 +03:00
Louis Lam 8bbf55777e
Merge pull request #1205 from arjunkomath/master 
Add notification provider - Push
 2022-03-04 21:39:59 +08:00
Louis Lam c52c8a4206 Merge branch 'master' into alerta 
# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
 2022-03-04 14:10:37 +08:00
Louis Lam 9789d8cde8 Merge branch 'master' into alerta 2022-03-04 14:09:01 +08:00
Louis Lam ccb3d85a48
Merge pull request #1157 from zackelia/master 
Implement gorush notifications
 2022-03-03 22:03:09 +08:00
Alvin Pergens cefe43800f add alerta service 2022-01-27 20:54:04 +01:00
Arjun Komath 74c584f544 Add Push by Techulus 2022-01-21 07:42:03 +00:00
Hans Mayer c679613f7e
Updates some DE translations, fix typo in resolverserverDescription, removes some duplicates in languages 2022-01-14 19:06:21 +01:00
Louis Lam 076d6bdbb6 Merge branch 'master' into mqtt 
# Conflicts:
#	package-lock.json
#	server/database.js
 2022-01-13 11:09:16 +08:00
Zack Elia ea43422ccf Implement gorush notifications 2022-01-09 12:05:11 -05:00
Philipp Bischoff bcc3cec7d6 extract translation for notification type 2022-01-05 23:57:40 +01:00
Patrick Hafner 3d6c52fbea
Merge branch 'master' into customstatuspage 2021-12-25 04:12:05 +01:00
Patrick Hafner 2c2a824f97 Add: en & de-DE language 2021-12-21 03:31:09 +01:00
Nelson Chan 624cd862a5 Feat: Expose SMTP DKIM settings 2021-12-19 13:30:53 +08:00
Tarun Singh d3c90df8a8 fixed edit monitor fields empty issues 2021-12-18 16:35:18 -05:00
Jonas Liebert 67849a9e84 add support for stackfield notifications 2021-12-02 08:53:45 +01:00
Louis Lam a796f80018
Merge pull request #902 from ivanbratovic/improve-translatables 
Fix untranslatable parts of the UI
 2021-12-01 13:59:00 +08:00
Ivan Bratović 9c5466890e Revert "Replace body and header placeholder functions with translations" 
This reverts commit 2c85491ee0.
 2021-11-29 12:40:53 +01:00
Paweł Kuffel c1267e9b3b feat: add SerwerSMS notification provider 2021-11-25 18:24:36 +01:00
Ivan Bratović 2ca7a5b962
Merge branch 'master' into improve-translatables 2021-11-24 10:03:30 +01:00
Ioma Taani 97cb060cf5 another typo 2021-11-23 16:39:04 +01:00
Ioma Taani 5afb29f8f9 typo 2021-11-23 16:35:18 +01:00
Nelson Chan f9bb48de13 WIP: Convert Settings to components 2021-11-17 10:45:18 +08:00