ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-30 02:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
5733 commits 30 branches 115 tags 68 MiB
Commit graph

5733 commits

This branch
This branch
All branches
Author SHA1 Message Date
Austin Miller
ef54d9e3b6 Add PagerTree Notification Provider 2023-02-06 11:33:14 -07:00
Louis Lam
0197778af1 Fix change language issue in the setup page 2023-02-06 22:35:56 +08:00
Louis Lam
68ead3414d WIP 2023-02-06 22:26:13 +08:00
Louis Lam
271cca0d23 Add Romanian in the dropdown 2023-02-06 15:21:45 +08:00
Faruk Genç
39c99b0ec4 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 
# Conflicts:
#	server/database.js
#	src/lang/en.json
 2023-02-05 18:19:46 +03:00
Louis Lam
e06c3ee5d4 Merge branch 'mariadb' into 2.0.X 
# Conflicts:
#	package.json
 2023-02-05 18:31:42 +08:00
Louis Lam
d4752b65de WIP 2023-02-05 18:01:54 +08:00
Louis Lam
dc4d2a77bb WIP 2023-02-05 17:45:36 +08:00
Louis Lam
b6d7af988d
Merge pull request #2718 from cyril59310/master 
Add keys for translation
 2023-02-05 12:04:55 +08:00
cyril59310
5fff63cd59 add keys for translation 2023-02-05 01:07:20 +01:00
Haytham Salama
c42e550382 style: formats 2023-02-04 23:46:19 +02:00
Haytham Salama
4323dee781 feat: add message thread id to lang 2023-02-04 22:54:19 +02:00
Haytham Salama
1bfb290718 feat: add message thread id for telegram nonfiction 2023-02-04 22:53:38 +02:00
Louis Lam
33d9c1bbb1 Merge branch 'true-rootless' into mariadb 
# Conflicts:
#	docker/dockerfile
 2023-02-04 18:40:39 +08:00
Louis Lam
27eddb7253 Update dockerfile 2023-02-04 18:37:12 +08:00
Louis Lam
0b40c65139 Merge remote-tracking branch 'origin/master' into mariadb 
# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/dockerfile-alpine
#	package.json
#	server/database.js
 2023-02-04 18:21:34 +08:00
Louis Lam
06dc61b343
Merge pull request #2567 from clcninja/feature-google-analytics 
Feature - Added Optional Google Analytics tag for Status Page.
 2023-02-04 17:58:18 +08:00
Louis Lam
afadfe32d5 Trim 2023-02-04 17:03:00 +08:00
Louis Lam
5f2affb38c Relocate and fix jsesc issue 2023-02-04 16:58:39 +08:00
Louis Lam
10c6f3b688 Merge remote-tracking branch 'origin/master' into feature-google-analytics 2023-02-04 15:40:13 +08:00
Faruk Genç
666838f334 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-04 00:03:05 +03:00
c
a823ed8ccc Feature - Google Analytics - Removed unused import. 2023-02-03 11:49:25 +00:00
Louis Lam
121ab82cc3
Merge pull request #2714 from Saibamen/auto_test_ignore_markdown 
Do not run auto-test for markdown-only commits. Update versions
 2023-02-03 17:41:17 +08:00
Adam Stachowicz
e0f0178644 Do not run auto-test for markdown-only commits. Update versions 2023-02-03 07:10:10 +01:00
Louis Lam
ec78d2a39b
Update README.md 2023-02-03 13:39:45 +08:00
Louis Lam
ff09276de2
Update README.md 2023-02-03 13:38:14 +08:00
Louis Lam
e631db89b8 Update to 1.20.0-beta.0 2023-02-03 13:21:19 +08:00
Louis Lam
d39508a007 Change nightly version format 2023-02-03 13:19:51 +08:00
Louis Lam
b0673ba9ce
Merge pull request #2570 from Computroniks/feature/#2365-allow-markdown-in-status-page-footer 
Add support for markdown on status page
 2023-02-03 12:36:50 +08:00
Joseph
2a6d98ff01
Feat: Expand and Simplify Badge Functionality (#2211) 
* [expanding badges] added new configs

* [expanding badges] recieve ping in getPreviousHeartbeat()

* [expanding badges] re-added original new badges

* [expanding badges] recreate parity between old and new badges

* [expanding badges] fix linting
 2023-02-03 12:33:48 +08:00
Louis Lam
f153082184 Drop en.js 2023-02-02 21:52:45 +00:00
c
913bb611d5 Feature - Google Analytics - Removed regex to validate a Google Analytics tag. 2023-02-02 21:52:45 +00:00
c
3afe8013ca Feature - Google Analytics - Change TEXT type to VARCHAR. 2023-02-02 21:52:45 +00:00
c
5a94a3fe3c Google Analytics - Moved string to updated file. 2023-02-02 21:52:44 +00:00
c
c08d8a5eaf Google Analytics - Simplified retrieving Tag ID from Status Page. 2023-02-02 21:51:03 +00:00
c
3ff0cbe311 Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS. 2023-02-02 21:51:03 +00:00
c
fb2999706c Feature - Google Analytics - Added JSDoc to Google Analytics functions. 2023-02-02 21:51:03 +00:00
c
2b3a3895b3 Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895 2023-02-02 21:51:03 +00:00
c
99c0b8cb71 Feature - Google Analytics - Addressing PR Comments. 2023-02-02 21:51:03 +00:00
c
29e24e0de9 Feature - Added Optional Google Analytics tag for Status Page. 2023-02-02 21:51:03 +00:00
Matthew Nickson
3819266fa8
Fixed style of links in markdown 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-02 17:55:40 +00:00
Peace
e10ba9ed7e
Merge branch 'master' into group-monitors 2023-02-02 17:59:48 +01:00
Faruk Genç
603b3a7fb6 Dummy commit for build 2023-02-02 19:50:29 +03:00
Faruk Genç
b2ddb5c9eb Dummy commit for build 2023-02-02 19:50:14 +03:00
Faruk Genç
4287f7e885 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 
# Conflicts:
#	src/lang/en.json
 2023-02-02 19:43:17 +03:00
Louis Lam
d0ac3fc207
Merge pull request #2676 from UptimeKumaBot/weblate-uptime-kuma-uptime-kuma 
Translations update from Uptime Kuma Weblate
 2023-02-03 00:09:56 +08:00
오로라
2b1cb66ff7 Translated using Weblate (Korean) 
Currently translated at 100.0% (692 of 692 strings)

Co-authored-by: 오로라 <dhfhfk1203@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/ko/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-02 16:04:50 +00:00
mrkbaji
99d4b8ba50 Translated using Weblate (Hungarian) 
Currently translated at 58.8% (407 of 692 strings)

Co-authored-by: mrkbaji <mrkbaji13@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/hu/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-02 16:04:50 +00:00
Dim
e1021ba38a Translated using Weblate (French) 
Currently translated at 100.0% (692 of 692 strings)

Co-authored-by: Dim <DimitriDR@users.noreply.weblate.kuma.pet>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/fr/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-02 16:04:50 +00:00
rubesaca
c2ca60aaa2 Translated using Weblate (Spanish) 
Currently translated at 94.6% (655 of 692 strings)

Translated using Weblate (Spanish)

Currently translated at 57.8% (400 of 692 strings)

Translated using Weblate (Spanish)

Currently translated at 56.6% (392 of 692 strings)

Translated using Weblate (Spanish)

Currently translated at 49.2% (341 of 692 strings)

Co-authored-by: rubesaca <rubesaca@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/es/
Translation: Uptime Kuma/Uptime Kuma
 2023-02-02 16:04:50 +00:00