Commit Graph

101 Commits

Author SHA1 Message Date
Karel Krýda
7532acc95d Resolve conflicts 2022-04-30 14:33:54 +02:00
Karel Krýda
ed84e56a85 Merge remote-tracking branch 'origin_kuma/master'
# Conflicts:
#	package-lock.json
#	server/database.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	src/components/MonitorList.vue
#	src/components/PingChart.vue
#	src/icon.js
#	src/pages/DashboardHome.vue
#	src/pages/StatusPage.vue
#	src/router.js
#	src/util.js
2022-04-30 13:40:34 +02:00
Louis Lam
023db1450d Fix #1577 2022-04-28 23:12:16 +08:00
Louis Lam
4114f43b48 Start both dev servers in one command 2022-04-26 02:18:14 +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
5fa62a888c Merge branch 'master' into mqtt2
# Conflicts:
#	server/database.js
#	server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam
46e1a628a7 Update package-lock.json 2022-04-17 15:04:59 +08:00
Louis Lam
03bcf5c766 Add a simple mqtt server for testing 2022-04-17 01:07:54 +08:00
Louis Lam
64a0e1aa9b Update package-lock.json 2022-04-16 13:31:40 +08:00
Louis Lam
2b0c184a88 Update package-lock 2022-04-14 01:21:43 +08:00
Louis Lam
4738581c66 Update dependencies 2022-04-02 11:34:00 +08:00
Uğur Erkan
9e27acb511 Add socks proxy agent 2022-03-06 19:34:51 +03:00
Uğur Erkan
2cc7a990ff Add http and https agents 2022-03-06 19:29:28 +03:00
Louis Lam
3a5b413af4 Update axios to 0.26.0 due to vulnerability 2022-02-26 14:36:38 +08:00
Louis Lam
742ad083e5 Fix security vulnerabilities 2022-02-03 12:26:50 +08:00
Louis Lam
41f1686147 Fix security vulnerabilities 2022-02-03 12:20:15 +08:00
Karel Krýda
0d3414c6d6 A complete maintenance planning system has been created 2022-01-23 15:22:00 +01:00
Louis
a0d51a15cf Fix security vulnerabilities 2022-01-18 01:24:07 +08:00
Louis Lam
9462646ad3 Fix vulnerabilities 2022-01-13 11:22:58 +08:00
Louis Lam
6014ed1156 Fix conflict 2022-01-13 11:19:26 +08:00
Louis Lam
5ee5ea909d Add Github Action: close-incorrect-issue.yml 2021-12-11 20:59:31 +08:00
Louis
b62f1475ee 🐍 2021-12-05 16:28:59 +08:00
Louis Lam
9f0c66d775 fix node-sqlite3 security issues 2021-11-24 14:53:15 +08:00
Louis Lam
94ffeeeab6 update dependencies 2021-11-23 13:32:24 +08:00
Tarun Singh
6828e8ef6d Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma 2021-11-03 21:47:44 -04:00
Tarun Singh
670754b697 added MQTT monitor type 2021-11-03 21:46:43 -04:00
Louis Lam
61135e8500 update package-lock.json 2021-10-31 13:18:06 +08:00
Louis
3e5ae00d25 update dependencies 2021-10-29 18:04:58 +08:00
Andreas Brett
8fb8cbdaf3 use auth0/jwt-decode 2021-10-26 13:15:31 +02:00
Louis Lam
ff5f2e8dfb add limiter 2021-10-21 23:03:40 +08:00
Louis Lam
56094a43d7 add passwordStrength 2021-10-21 22:54:04 +08:00
Louis Lam
176fa6b60d merge package-lock.json 2021-10-16 16:32:28 +08:00
Nelson Chan
656a4d6270 WIP: Enable background jobs
WIP: Remove better-sqlite3
2021-10-09 21:46:59 +08:00
LouisLam
01812cc446 [test] add test for i18n currentLocale 2021-10-08 15:11:50 +08:00
LouisLam
c0846124c2 update vite to 1.6.4, since it fixed the issue 2021-10-07 21:23:28 +08:00
Louis Lam
8c63536eb8
Merge pull request #451 from zsxeee/notification_form_i18n
Notification form i18n
2021-10-07 14:13:08 +08:00
LouisLam
a8badb027d update modded node-sqlite3 to 6.0.0 2021-10-07 14:09:50 +08:00
zsxeee
7f1edb49bc
Fix i18n
Upgrade vue-i18n to 9.1.9.
Fix wrong tag name.
2021-10-07 00:04:13 +08:00
zsxeee
7002a778f0
Rollback vue-i18n version to 9.1.7 2021-10-06 19:12:23 +08:00
LouisLam
e71f5bf314 update dependencies 2021-10-05 17:53:17 +08:00
LouisLam
79e0c9e1f1 setup unit test for setup 2021-10-05 17:39:44 +08:00
LouisLam
259bcf9426 [SMTP] "To Email" is not required if CC/BCC is set. (#461) 2021-10-05 15:57:13 +08:00
LouisLam
a2a4c70cf5 setup jest-puppeteer 2021-10-03 18:16:55 +08:00
LouisLam
6513c3e75f allow update minor version only, to prevent the breaking change in the future like vite 2.6 2021-10-01 16:48:23 +08:00
LouisLam
1fa90bffaa freeze vite version to 2.5.* (2.6.* is broken when build the project) 2021-09-30 14:43:29 +08:00
LouisLam
aaddfa1786 update package-lock.json 2021-09-29 13:30:28 +08:00
MrEddX
0f66e5cfc5 Added Bulgarian Language 2021-09-28 23:21:59 +03:00
LouisLam
51512b6f5f update dependencies 2021-09-24 19:00:06 +08:00
LouisLam
266b03fbf7 language key from "Status Page Nothing" to "statusPageNothing" 2021-09-24 14:42:54 +08:00
LouisLam
fe0fc63843 [status page] send uptime 2021-09-22 15:10:08 +08:00