ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-31 11:40:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
3070 commits 31 branches 115 tags 54 MiB
Commit graph

3070 commits

This branch
This branch
All branches
Author SHA1 Message Date
Louis Lam
200fdfb808 Merge code manually since some code moved to another file 2022-04-19 16:46:45 +08:00
Louis Lam
29d2d95c71 Merge branch '1.14.X' 
# Conflicts:
#	package.json
#	server/server.js
 2022-04-19 16:43:13 +08:00
Louis Lam
b782b25e17 Update to 1.14.1 2022-04-19 16:01:08 +08:00
Louis Lam
919393cac9 Partially change the server core into a class, remove all require("./server") #1520 2022-04-19 15:38:59 +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
17d4003e5c Add dropdown menu 2022-04-19 00:39:49 +08:00
Louis Lam
cefb5bb60a Merge branch 'master' into #1209-Logout-button-in-navbar 2022-04-18 20:39:24 +08:00
Louis Lam
9bf3b3a0f4
Update README.md 2022-04-18 19:15:50 +08:00
Louis Lam
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message 
Feat: Allow MQTT successMessage to be optional
 2022-04-18 19:06:39 +08:00
Louis Lam
addf75daa7 Fix MQTT password do not save 2022-04-18 19:05:14 +08:00
Louis Lam
359a490ae3 Fix #1510 2022-04-18 15:21:58 +08:00
Nelson Chan
cd38dd3f68 Feat: Allow MQTT successMessage to be optional 2022-04-18 13:04:55 +08:00
Louis Lam
f712fe85e5 Update node-sqlite, sqlite from 3.36 to 3.38 2022-04-18 12:44:32 +08:00
Louis Lam
c28b90feb4 Update to 1.15.0-beta.0 2022-04-17 20:07:32 +08:00
Louis Lam
ceba096f3e
Merge pull request #875 from tarun7singh/master 
Added MQTT Monitor type
 2022-04-17 20:05:41 +08:00
Louis Lam
2a248ad73f Change mqtt_topic from VARCHAR to TEXT 2022-04-17 19:56:47 +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
e6a8a84278 Include only nessacary data in webhook 2022-04-17 19:30:58 +08:00
Louis Lam
47c72192e1 [eslint] Enable yoda and eqeqeq 2022-04-17 15:43:03 +08:00
Louis Lam
d71c086447 Standardize array bracket spacing 2022-04-17 15:27:35 +08:00
Louis Lam
46e1a628a7 Update package-lock.json 2022-04-17 15:04:59 +08:00
Louis Lam
cd3dfd3146
Merge pull request #1083 from patrickhafner/customstatuspage 
Custom status page
 2022-04-17 15:04:02 +08:00
Louis Lam
572f2b9838 eslint 2022-04-17 14:57:31 +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
Matthew Nickson
45f44b183d
Add JSDoc to server/model/* 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-16 21:11:45 +01:00
Matthew Nickson
5a209c74e1
Add JSDoc to server/notification-providers/* 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-16 20:24:53 +01:00
Louis Lam
4e6ddc8880
Merge pull request #1497 from MrEddX/bulgarian 
Bulgarian
 2022-04-17 01:40:43 +08:00
Louis Lam
07c474db0b Merge remote-tracking branch 'origin/master' 2022-04-17 01:40:05 +08:00
Louis Lam
8d8c38b1a8 Allow unused vars in args and fix more eslint issues 2022-04-17 01:39:49 +08:00
Louis Lam
03bcf5c766 Add a simple mqtt server for testing 2022-04-17 01:07:54 +08:00
Louis Lam
136fdf3768 MQTT password field to password type 2022-04-17 01:07:36 +08:00
Louis Lam
e34420368b Remove try-catch and fix username/password/port not working for mqtt 2022-04-17 01:06:47 +08:00
Matthew Nickson
60c63cc18e
Add JSDoc to server/jobs/* 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-16 11:10:51 +01:00
Louis Lam
566133e350 Domain Name Expiry Notification for https monitor only 2022-04-16 15:01:53 +08:00
Louis Lam
30e113755e Add HIDE_LOG and catch error if cannot subscribe topic 2022-04-16 14:50:48 +08:00
Louis Lam
083e8355b7 Change debug to log.debug 2022-04-16 13:37:17 +08:00
Louis Lam
64a0e1aa9b Update package-lock.json 2022-04-16 13:31:40 +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
Matthew Nickson
6fb66728e6
[empty commit] pull request for Add JSDoc comments 2022-04-15 20:08:54 +01:00
Matthew Nickson
a680331dd7
Fixes issue with ::1 port 5300 requests 
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-04-15 19:59:32 +01:00
Louis Lam
b7aebceaab
Update bg-BG.js 2022-04-15 19:49:16 +08:00
MrEddX
0302fdbc96
Update bg-BG.js 
Status pages - fix
 2022-04-15 13:10:14 +03:00
MrEddX
84a50f058f
Update bg-BG.js 2022-04-15 13:06:22 +03:00
MrEddX
9ec652639b
Merge branch 'louislam:master' into bulgarian 2022-04-15 13:03:34 +03:00
Louis Lam
0c40e32d75
Merge pull request #1007 from chakflying/feat/save-chart-period 
Feat: Save and restore chart period
 2022-04-15 12:34:53 +08:00
Jordan Bertasso
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url 2022-04-15 14:13:44 +10:00
Nelson Chan
6f99d7577b Fix: Limit saved period & clear when set to recent 2022-04-15 03:24:58 +08:00
Nelson Chan
1417b6eacf Feat: Save and restore chart period 2022-04-15 02:56:21 +08:00
MrEddX
1baee42cf5
Merge branch 'louislam:master' into bulgarian 2022-04-14 10:55:04 +03:00