Commit graph

4835 commits

Author SHA1 Message Date
Louis Lam
7a7783a266 Fix conflict 2023-09-18 03:30:40 +08:00
Louis Lam
59119b9e71 Merge branch '1.23.X'
# Conflicts:
#	package-lock.json
2023-09-18 03:26:59 +08:00
Louis Lam
b3b8e9f3a0 Update to 1.23.2 2023-09-18 03:04:29 +08:00
Louis Lam
e5345848a2 Update dependencies 2023-09-18 03:01:58 +08:00
Nelson Chan
0d846be10e
Fix: misc. styling fixes (#3757) 2023-09-17 20:43:09 +08:00
FC (Fay) Stegerman
d8a8f6c08b
EditMonitor: add missing config UI for json-query (#3751) 2023-09-17 20:39:07 +08:00
Louis Lam
f98a1ce077 Ignore some build files 2023-09-17 20:32:49 +08:00
Louis Lam
86fa57449e Fix #3596 2023-09-17 02:56:19 +08:00
Louis Lam
ff51704cdf Fix #3712 2023-09-17 02:40:08 +08:00
Henrik Gerdes
33804d8823
fix: respect the user defined oauth2 auth method (#3727) 2023-09-16 05:13:20 +08:00
Nelson Chan
1e12ca4786
Fix: Disable save button on submit (#3729) 2023-09-16 05:11:18 +08:00
Louis Lam
9ef1e69ae0
Push Examples (#3735) 2023-09-13 20:03:12 +08:00
Louis Lam
9c24cd3973
Update README.md 2023-09-11 18:22:03 +08:00
Louis Lam
1654d13db9
Update CONTRIBUTING.md 2023-09-11 04:02:26 +08:00
DevMirza
82bad6deaa
🐛 fix: AutoTest workflow (#3725) 2023-09-10 18:33:55 +08:00
Louis Lam
83d91dbb1b Set mariadb timezone to UTC using +00:00 (#3723) 2023-09-10 18:33:09 +08:00
Louis Lam
13a799d778 [eslint] space-infix-ops = error 2023-09-10 02:06:06 +08:00
Nelson Chan
0af4ee6c34
Fix: Missing await for isActive (#3717) 2023-09-10 01:54:03 +08:00
Frank Elsinga
7711679e1a
made shure that all databse patches have the db-patch warning (#3624) 2023-09-10 00:28:53 +08:00
Louis Lam
faf8b5e7ce
Fix prevent-file-change (#3722) 2023-09-09 19:45:11 +08:00
Louis Lam
fd680feb97
Prevent to modify lang files (#3720) 2023-09-09 19:25:09 +08:00
Frank Elsinga
d6af9162c1
Chore: Extracted the dns monitor to its own monitor-type (#3413)
* extracted the dns monitor to its own monitor-type

* linting fixes

* another formatting fix

* Fix: Improve dnsMessage handling (#3614)

* fixed docs

* fixed formatting changes
2023-09-09 18:14:55 +08:00
Anders Kvist
f0c54be43f
Adding x-www-form-urlencoded (#3499)
* Adding x-www-form-urlencoded

* Adding example of x-www-form-urlencoding to body.

* A bit cleaner.

* Update server/model/monitor.js

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update src/pages/EditMonitor.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update src/pages/EditMonitor.vue

Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Add simple test

---------

Co-authored-by: Anders Kvist <ak@cego.dk>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-09-09 18:05:25 +08:00
Louis Lam
9f7f7a182e Minor 2023-09-07 16:35:31 +08:00
ZaneL1u
1f29fabe64
fix: fix the judgment condition of Tailscale (#3701) 2023-09-07 16:15:21 +08:00
Frank Elsinga
d6302198f3
chore(jsdoc):Linting fixes (#3703)
* fixed the lockfile having a different version

* jsdoc
2023-09-07 15:42:44 +08:00
Louis Lam
d243cd84bf
docker-compose change back to 1 2023-09-07 14:10:10 +08:00
Nelson Chan
f3e1a9c61a
Fix: Incorrect database check in sqlHourOffset (#3706) 2023-09-07 14:00:49 +08:00
Louis Lam
a8bc0f8d6a
Fix auto test (#3702) 2023-09-06 21:34:43 +08:00
Nelson Chan
bfc7b498be
Feat: Toast notification timeout settings (#3441)
* Add toast timeout to the settings

Changing gui, adding timeout with a fix value

memo

rc

rollback readme

cleanup code

cleanup code

Review fixes

review fix 2

* Feat: Add clearAll button below toastContainer

* Feat: Load & Apply defaults, improve wording

Chore: Remove unused

* Feat: Change setting to affect monitor notif. only

* Apply suggestions from code review

Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Chore: Fix JSDoc

---------

Co-authored-by: Berczi Sandor <sandor.berczi@urss.hu>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-09-06 19:52:54 +08:00
mueller-ma
62f4434711
Fix typo (#3694) 2023-09-06 01:35:47 +08:00
Louis Lam
33f7448048
Don't run worst case test on GitHub Actions (#3688)
* Don't run worst case test on GitHub Actions

* Deprecate jest
2023-09-05 02:08:18 +08:00
Louis Lam
9c61247162 Fix #3679 2023-09-04 21:32:48 +08:00
Louis Lam
ed04008569 Remove incorrect warning 2023-09-02 17:20:36 +08:00
Louis Lam
f3517bc08d Fix avg ping 2023-09-02 17:11:22 +08:00
Brandon De Rose
283d52a861
UI/UX: Added no tags found message to tags filter (#3676) 2023-09-02 14:14:14 +08:00
Louis Lam
6e887b056c Fix docker build issue in 2.0 2023-09-01 23:47:36 +08:00
Nelson Chan
52946c3e08
Feat: Translate toast messages by adding msgi18n to callbacks (#3263)
* WIP: Add msgTranslated to callbacks

* Chore: Unify Saved period

* Feat: add support for interpolation
2023-09-01 20:51:28 +08:00
Louis Lam
64b97c0f29
Lock to npm@9 (#3670) 2023-09-01 17:30:09 +08:00
Louis Lam
38f5f16dc7 [exe] Remove Costura.Fody 2023-09-01 16:29:05 +08:00
Jean-Paul van Houten - Bos
fd90828914
Added option to use --intranet to not download or update any files,… (#3350)
* Added option to use `--intranet` to not download or update any files, this can only be done after an initial run.

* Dropped some unneeded debug changes that I commited by accident

* Added conventional suggestions from Github.com comments

---------

Co-authored-by: Jean-Paul van Houten - Bos <jeanpaul.vhouten@koop.overheid.nl>
2023-09-01 16:20:00 +08:00
Louis Lam
42bba73ffe
Merge pull request #2720 from louislam/2.0.X
2.0.0
2023-09-01 05:26:25 +08:00
Louis Lam
5061e42d4b Merge remote-tracking branch 'origin/2.0.X' into 2.0.X 2023-09-01 05:23:52 +08:00
Louis Lam
076331bf00
Uptime calculation improvement and 1-year uptime (#2750) 2023-09-01 05:19:21 +08:00
Louis Lam
a13fc7079e Merge branch 'master' into 2.0.X
# Conflicts:
#	package-lock.json
2023-08-30 01:39:16 +08:00
Louis Lam
c4e222d1e6
Update README.md 2023-08-29 20:49:03 +08:00
Louis Lam
f2a1c26ef8 Update to 1.23.1 2023-08-29 03:52:53 +08:00
Louis Lam
8772baad9a Update dependencies 2023-08-29 03:39:47 +08:00
Louis Lam
215c89e8d3
Merge pull request #3612 from UptimeKumaBot/weblate-uptime-kuma-uptime-kuma
Translations Update from Weblate
2023-08-29 03:09:48 +08:00
Unai Tolosa Pontesta
e6a055af19 Translated using Weblate (Basque)
Currently translated at 68.9% (557 of 808 strings)

Co-authored-by: Unai Tolosa Pontesta <utolosa002@gmail.com>
Translate-URL: https://weblate.kuma.pet/projects/uptime-kuma/uptime-kuma/eu/
Translation: Uptime Kuma/Uptime Kuma
2023-08-28 08:15:57 +00:00