mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-14 17:44:32 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2550 commits 31 branches 115 tags 56 MiB
Commit graph

1267 commits

Author SHA1 Message Date
Andreas Brett 2f97f44086
Update MonitorHistory.vue 2021-11-29 20:37:44 +01:00
Andreas Brett a13bdaac84
Merge branch 'master' into logging 2021-11-29 20:32:42 +01:00
Louis Lam 40cb22e671
Merge pull request #963 from kffl/feat/serwersms-provider 
Add SerwerSMS.pl notification provider
 2021-11-29 20:43:38 +08:00
Ivan Bratović d95258e7db Merge remote-tracking branch 'upstream/master' into improve-translatables 2021-11-29 12:51:08 +01:00
Ivan Bratović baae4b5a5e Remove unused translation keys from hr-HR 2021-11-29 12:49:38 +01:00
Ivan Bratović c1b118a0f6 Use existing Example translation for HTTP headers and body placeholders 2021-11-29 12:49:08 +01: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
Louis Lam 6cd130de38 minor 2021-11-29 17:20:12 +08:00
Louis Lam 5070927478
Merge pull request #980 from MrEddX/bulgarian 
Update bg-BG.js
 2021-11-29 16:56:02 +08:00
Louis Lam 077f3837d9 update language guide 2021-11-29 16:53:00 +08:00
Louis Lam aea128a85b make settings' menu reactive 2021-11-29 16:50:00 +08:00
Louis Lam c50b2b636a [lazy load lang] load the language file on create 2021-11-29 16:45:52 +08:00
MrEddX a284703d9e
Update bg-BG.js 
- Fixed existing field
- Added new field
- Translated new field
 2021-11-28 07:11:20 +02:00
kffl 64ec766423
translate(serwersms): fix pl translation capitalization 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-27 13:22:54 +01:00
kffl 186c11540f
style(serwersms): add missing trailing commas 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-27 13:16:17 +01:00
Louis Lam 50593f3edf [wip] lazy load language file 2021-11-26 16:31:19 +08: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
Louis Lam a1f9a82537
Merge pull request #884 from thomasleveil/ux/add-group-at-the-top 
🚸 Status page - add group action adds the new group at the top
 2021-11-24 11:48:58 +08:00
Fluency e3745da986
Merge branch 'master' into master 2021-11-23 10:26:45 -08:00
Ioma Taani 3a32fd6f42 aggiornata la traduzione 2021-11-23 16:39:38 +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
Ioma Taani f9b8dbf4db
Merge branch 'louislam:master' into master 2021-11-23 16:30:48 +01:00
Louis Lam 92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth 
Implement explicit HTTP "basic" authentication support
 2021-11-23 22:48:54 +08:00
Louis 4155f84eec improve basic auth style 2021-11-23 19:20:55 +08:00
Ioma Taani bd3d34400d Merge branch 'master' of https://github.com/iomataani/uptime-kuma 2021-11-22 23:39:10 +01:00
Andreas Brett ed96757b24
Merge branch 'louislam:master' into logging 2021-11-19 08:56:25 +01:00
Fluency a2de9e4e36
Fixed export-function signature being scrambled. 2021-11-17 16:02:31 -08:00
Nelson Chan df813fbdee Fix: Add save in monitor history 2021-11-17 10:45:19 +08:00
Nelson Chan 07742799ed Test: Fix tests 
Test: Add clear stats test

Test: Attempt to fix tests

Test: Add test for disable auth

Update README
 2021-11-17 10:45:19 +08:00
Nelson Chan f65cc655c0 Fix: Fix nav highlight in settings sub-page 2021-11-17 10:45:19 +08:00
Nelson Chan 1a218aaa17 Fix: Fix page transition & improve active handling 
Fix: Fix current route parsing
 2021-11-17 10:45:19 +08:00
Nelson Chan 369cad90c1 WIP: Convert to use vue-router & improve layout 
WIP: Fix security page & improve layout

WIP: Fix displaying current page

UI: Improve spacing

Chore: Improve styling
 2021-11-17 10:45:18 +08:00
Nelson Chan f9bb48de13 WIP: Convert Settings to components 2021-11-17 10:45:18 +08:00
Tarun Singh 3f5133d1ba Added authentication logic 2021-11-16 20:44:10 -05:00
Louis Lam 74d2b38cb6
Merge pull request #925 from iomataani/italian-language-update 
Translation update
 2021-11-16 19:12:07 +08:00
MultiGamer8853 be3a791e6e
Update ja.js 
日本語を最適化
 2021-11-16 18:14:23 +09:00
Ioma Taani 9747048890 correzioni e miglioramenti 2021-11-16 09:04:10 +01:00
Andreas Brett 6f2dcc6dd7 using provided tsc config 2021-11-15 18:07:18 +01:00
Andreas Brett 57bed4d672
Merge branch 'louislam:master' into logging 2021-11-15 18:04:45 +01:00
Andreas Brett df36a4bb3c console.info for level "info" 2021-11-15 18:02:14 +01:00
Andreas Brett e5913c5abc separate log functions 2021-11-15 17:52:28 +01:00
Phuong Nguyen Minh d5d957b748
update vi.js (#853) 
* update vi.js

* Update vi.js

* Update vi.js
 2021-11-15 13:27:31 +08:00
Ioma Taani 5cdb5edeb3 corretto 2021-11-13 17:00:23 +01:00
Ioma Taani 73c18b6ff0 correzione 2021-11-13 16:53:07 +01:00
Ivan 567ea346fe Add missing translations for placeholders in EditMonitor page 2021-11-12 15:30:31 +01:00
Ivan 453f6fbadf Add more missing translations 2021-11-12 15:19:33 +01:00
Ivan dd79042128 Add translation for "Info" in Settings 2021-11-12 15:14:28 +01:00
Ivan 583e6bf978 Update croatian language for testing new translation 2021-11-12 13:32:24 +01:00
Ivan b1fca7c1a7 Add translation of toast success message 2021-11-12 12:00:10 +01:00
Ivan 19dd11d624 Add translation for incident error message 2021-11-12 10:14:23 +01:00
Ivan 42ce34b6c7 Add more Status page tranlations 2021-11-12 09:54:31 +01:00
Ivan b7a9d1474f Fix translation of selected incident style 2021-11-12 09:53:41 +01:00
Ivan 31fa67452e Delint English language file 2021-11-12 09:31:27 +01:00
Ivan 9ef3727c91 Backed out of commit be1933614 
Running update-language-files will just confuse translators
 2021-11-12 09:29:06 +01:00
Ivan Bratović ed39485af9 Merge with upstream master 
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
 2021-11-12 09:23:20 +01:00
Ioma Taani daef238a70
Updated Italian Language (#911) 
Co-authored-by: Paride Barison <paride.barison@lantechlongwave.it>
 2021-11-12 01:28:22 +08:00
Andreas Brett d21f7971b5 missed settings 2021-11-11 12:56:53 +01:00
Andreas Brett bdcdf47e52 introduce consistent logging 2021-11-11 12:31:28 +01:00
Ivan 4cc433166e Add missing translation for SMTP security option 2021-11-11 11:14:21 +01:00
Ivan 28f530394e Add missing translation lookup for ClickSendSMS 2021-11-11 11:12:48 +01:00
Ivan b0615d347b Add incident creation translations 2021-11-11 11:07:48 +01:00
Ivan be19336149 Run update-language-files for all languages 2021-11-11 10:57:33 +01:00
Ivan 94508cae2f Add some missing translations 2021-11-11 10:54:36 +01:00
Ivan 265cca9ed1 Replace "Default" notification badge with translation 2021-11-11 10:54:09 +01:00
Ivan 267654c987 Replace hard-coded names for groups in Status page with translations 2021-11-11 10:53:38 +01:00
Ivan 2c85491ee0 Replace body and header placeholder functions with translations 2021-11-11 10:52:22 +01:00
Adam Stachowicz ba46fb6b1c Clickable URL 2021-11-10 09:11:19 +01:00
Calum Bird f55350bebc Generated documentation :) 2021-11-09 21:24:31 -08:00
Tarun Singh 3721d11259 changed table column names for more specifity 2021-11-09 18:53:00 -05:00
Louis Lam 5df34cd137
Merge pull request #885 from ZegertBoele/patch-1 
Update to dutch translations
 2021-11-09 23:20:21 +08:00
Louis Lam 95bae8289d Fix setting page when disabled auth 2021-11-09 22:37:05 +08:00
Zegert Boele dff1056bb1
Update nl-NL.js 
@deefdragon noticed a flaw, fixed in here
 2021-11-09 09:52:09 +01:00
Zegert Boele 62222c0336
Update src/languages/nl-NL.js 
@koen20 added this correction.

Co-authored-by: Koen Habets <6172623+koen20@users.noreply.github.com>
 2021-11-09 09:49:42 +01:00
Ivan Bratović 734762b773 Merge with master 
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
 2021-11-08 09:53:54 +01:00
Ivan Bratović 34d8984e3a
Merge branch 'master' into http-basicauth 2021-11-07 17:15:36 +01:00
Louis Lam ad82ab0305
Merge pull request #883 from andreasbrett/patch-7 
24h tooltip on status page
 2021-11-07 17:24:03 +08:00
Louis Lam f952d283c6
Merge pull request #815 from Fallstop/tags-on-status 
Display Monitor Tags on Status Page
 2021-11-07 17:05:21 +08:00
Louis Lam e164fabf81
Merge pull request #849 from Minvinea/master 
Adding missing translations
 2021-11-07 13:56:15 +08:00
Louis Lam bc69a331ee eslint 2021-11-07 13:50:22 +08:00
Jasper Miller-Waugh e4506963d9
Merge branch 'louislam:master' into tags-on-status 2021-11-07 14:39:43 +13:00
Zegert Boele 222540898b
Some translations were not translated 
Some translations were not translated yet. I have added them and can be contacted if you want more English-Dutch translations.
 2021-11-05 13:57:55 +01:00
Thomas LEVEIL baf3612ece 🚸 Status page - add group action adds the new group at the top of the page 2021-11-05 11:27:19 +01:00
Andreas Brett 8f44b9f618 24h tooltip on status page 2021-11-05 09:54:10 +01:00
Tarun Singh 149015556b server url changes 2021-11-04 22:25:29 -04:00
Tarun Singh 2bcbeba384
update review suggestions 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-04 22:23:02 -04:00
Ivan Bratović 0481a241f3 Add translated placeholders for editing basic auth 2021-11-04 10:22:42 +01:00
Ivan Bratović 179ca232bc Minor refactor - change variable names and add commas to object definitions 2021-11-04 10:14:17 +01:00
Ivan Bratović 0dcb7aed21 Delinting 2021-11-04 09:50:10 +01:00
Ivan Bratović 23736549f9 Implement HTTP basic auth feature 2021-11-04 09:50:10 +01: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
Adam Stachowicz 314fa18bdc Fix #871 2021-11-04 00:19:04 +01:00
MrEddX ee2c54cfd1
Update bg-BG.js 
- Added New Fields
- Fixed Existing Fields
 2021-11-03 11:49:22 +02:00
Louis Lam dee131c25d fix table hover color not working after updated bootstrap to 5.1.3 2021-11-03 13:02:44 +08:00
Jasper Miller-Waugh e5d6410caf
Apply formatting suggestions from code review 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-03 11:46:53 +13:00
Ivan Bratović 1fb9b25d13 Improve hr-HR translations 2021-11-02 14:09:01 +01:00
Ivan Bratović 9a135deac2 Add new translation for 'Uptime' 2021-11-02 11:48:55 +01:00
Your Name 8e6173c05e Fix and add new hr-HR translations 2021-11-02 10:33:13 +01:00
Jasper Miller-Waugh 191b81ee07
Fix grammer in comment 
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
 2021-11-01 22:14:41 +13:00
Jasper Miller-Waugh 12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool. 
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the  tagsVisible setting in the database to fix.
 2021-11-01 13:23:46 +13:00
Jasper Miller-Waugh 4004926e64
Small formatting changes from code-review 
Co-authored-by: deef <deef551@gmail.com>
 2021-11-01 12:52:21 +13:00
Adam Stachowicz 4d3d6d6e25 Missing this... 2021-10-31 21:59:56 +01:00
Adam Stachowicz d06e5ef6fa More small letters 2021-10-31 21:53:11 +01:00
Adam Stachowicz b12b848d97 One more typo... 2021-10-31 21:48:43 +01:00
Adam Stachowicz bb96a577ca Fix typos + translate wayToGetTeamsURL 2021-10-31 21:47:07 +01:00
Adam Stachowicz 8840ca618b Update pl.js 2021-10-31 21:22:19 +01:00
Minvinea 8ec858fd14
Add missing translation 
Line 282 to 306
 2021-10-31 21:18:36 +01:00
Louis Lam 741ed548da Merge branch 'master' into use_hideCount_option 2021-10-31 13:09:50 +08:00
Louis Lam bc615c2dd8
Merge pull request #832 from ivanbratovic/croatian-language 
Clarity and grammar fixes to hr-HR languange file
 2021-10-31 00:52:41 +08:00
Louis Lam 1dbf1c3dea fix logout 2021-10-30 23:33:20 +08:00
Jasper Miller-Waugh b32bfb3ff1
Added toggle for tag visibility 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 24664cde2c
Smarter CSS to fix Mobile alignment 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 348c5ec995
Match lint settings 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 9143b73f84
Styling for tags 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 5e6d945095
Most hacked in POC 2021-10-30 21:16:10 +13:00
Willian Rodrigues Barbosa 036218f711 Add badges to favicon 2021-10-29 22:25:32 -03:00
Adam Stachowicz 69aa60d1fb Add missing i18n key + translate 2 keys for polish 2021-10-29 17:01:29 +02:00
Ivan Bratović eaecd6e571 Clarity and grammar fixes to hr_HR languange file 2021-10-29 16:53:55 +02:00
Adam Stachowicz f2a27a2cf1 Use hideCount option for pagination 2021-10-29 13:37:38 +02:00
Louis Lam 5311bef3eb
Merge pull request #809 from Saibamen/pagination_no_text 
Don't display "count" text for pagination
 2021-10-29 16:05:59 +08:00
Louis Lam c400595f67
Merge pull request #825 from SiderealArt/patch-1 
Add Traditional Chinese (Taiwan) translation
 2021-10-29 16:05:01 +08:00
SiderealArt 67a22399bc
Update i18n.js 2021-10-29 15:44:33 +08:00
SiderealArt 947fc6001e
Update Settings.vue 2021-10-29 15:43:21 +08:00
SiderealArt c87e67ad1b
Add Traditional Chinese (Taiwan) translation 2021-10-29 15:39:02 +08:00
Ivan Bratović 6f92774a8f ESLint pass on hr-HR.js file 2021-10-28 16:17:07 +02:00
Ivan Bratović 6e76ab7426 Import hr-HR language in i18n.js 2021-10-28 16:07:47 +02:00
Ivan Bratović b2fbd7e263 Add confirmDisableAuth tranlation for hr-HR 2021-10-28 16:04:56 +02:00
Ivan Bratović 199e6ec82b Add initial version of Croatian language 2021-10-28 15:56:34 +02:00
Adam Stachowicz 18a99c2016 Revert deleting records and "One record" keys 2021-10-28 14:20:56 +02:00
Louis Lam de5cce9d90 Steam API Key to HiddenInput 2021-10-27 23:03:03 +08:00
Louis Lam 71884cf42a
Merge pull request #772 from andreasbrett/patch-6 
show logged in user on settings page
 2021-10-27 10:24:45 +08:00
MrEddX cb3da50e7e
Update bg-BG.js 
Small fixes
 2021-10-26 22:46:57 +03:00
Adam Stachowicz 2e7ad1b7b2 Don't display "count" text for pagination 2021-10-26 18:03:49 +02:00
Louis Lam a9e319517a add auto vacuum and shrink database button 2021-10-26 23:02:32 +08:00
Andreas Brett 8fb8cbdaf3 use auth0/jwt-decode 2021-10-26 13:15:31 +02:00
Andreas Brett 3f3d8b4eb3 fixes 2021-10-26 12:58:04 +02:00
Louis Lam 77addfebc8 Merge branch 'tarun7singh_master' 
# Conflicts:
#	src/languages/vi.js
 2021-10-26 16:26:59 +08:00
Louis Lam 16846c7c6d
Merge pull request #790 from Saibamen/pl_update+fixes 
PL update + fixes
 2021-10-26 16:25:04 +08:00
Louis Lam d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification 
Support for Bark (APN) notifications
 2021-10-26 16:23:11 +08:00
Louis Lam 78424b4f2d add simple loading chart effect 2021-10-26 12:48:21 +08:00
Louis Lam f8055ed03d minor css 2021-10-26 12:33:46 +08:00
Louis Lam fe4724fc53 Merge branch 'master' into feat/chart-period 2021-10-26 12:25:07 +08:00
Lakr Aream 43791ee97e Merge branch 'master' into dev-lakr233-bark_notification 2021-10-26 09:08:11 +08:00
Tarun Singh 6362ef6a9c removed other langauge translation data 2021-10-25 18:30:40 -04:00
Adam Stachowicz 9d3a4e9d1e Remove dot from needPushEvery 2021-10-26 00:00:54 +02:00
Tarun Singh ba1e025353 added click send to number 2021-10-25 04:11:57 -04:00
Andreas Brett 4fc2603818 Merge branch 'patch-6' of https://github.com/andreasbrett/uptime-kuma into patch-6 2021-10-25 01:34:06 +02:00
Andreas Brett 7bc38d4231 remove unused vars 2021-10-25 01:33:45 +02:00
Andreas Brett daad63d70b
Merge branch 'master' into patch-6 2021-10-25 01:24:31 +02:00
Andreas Brett 9ddd2c7365 use jwt 2021-10-25 01:23:02 +02:00
Adam Stachowicz fa5ba12e14 Missing this 2021-10-24 22:15:02 +02:00
Adam Stachowicz 85053f865e Fix typo 2021-10-24 21:56:37 +02:00
Adam Stachowicz 1239f6d1a2 PL update + fixes 2021-10-24 21:50:02 +02:00
Tarun Singh fed611d1b9 Merge branch 'master' of https://github.com/louislam/uptime-kuma 2021-10-24 15:19:25 -04:00
Tarun Singh bc68088350 Click send sms integration for notifications 2021-10-24 15:17:29 -04:00
Louis Lam 90200958cd
Merge pull request #780 from kry008/patch-4 
Update pl.js
 2021-10-25 00:35:31 +08:00
Ponkhy d82f305f6e Updated german language file 2021-10-24 17:56:05 +02:00
Nelson Chan 665bae0806 UI: Simplify dropdown design 2021-10-24 01:45:57 +08:00
Nelson Chan e4be28a9e7 Fix: Validate beat time before appending 2021-10-24 01:45:38 +08:00
Nelson Chan 445674aacb Chore: Improve code formatting & comments 2021-10-24 01:45:10 +08:00
Nelson Chan 2f7b60f5e5 Feat: Use separate storage for custom chart period 
Fix: Fix import error
 2021-10-24 01:44:55 +08:00
Nelson Chan b83c59e308 WIP: Add options for chart period 
Fix: Fix callback, add toast on error

Fix: Improve styling

Fix: Restore default chart behavior

Fix: Replace 1h with 3h

draft only
 2021-10-24 01:44:08 +08:00
Lakr Aream ce852dfa02 Support for Bark (APN) notifications 
Update bark.js
 2021-10-24 00:31:43 +08:00
Louis Lam c9549c0de2 change body and header placeholders, less misleading. 2021-10-23 22:14:05 +08:00
kry008 b5eb17ed93
Update pl.js 2021-10-23 15:07:24 +02:00
Andreas Brett 4becb97a5d
Update en.js 2021-10-23 01:54:36 +02:00
Andreas Brett 85e2b36424
Update en.js 2021-10-23 01:54:07 +02:00
Andreas Brett abdf1ae90a
Update en.js 2021-10-23 01:53:31 +02:00
Andreas Brett 606c967985
Merge branch 'master' into patch-6 2021-10-23 01:52:54 +02:00
Andreas Brett 9ad8e5f56a show logged in user 2021-10-22 13:05:52 +02:00
Louis Lam 8a481a1be0
Merge pull request #769 from andreasbrett/patch-5 
show beat.msg only if available
 2021-10-22 18:14:52 +08:00
Andreas Brett 657987a013 fix: show beat.msg only if available 2021-10-22 11:59:53 +02:00
Louis Lam d74577608b
Merge pull request #766 from DX37/translation-ru 
Update notifications area in ru-RU.js
 2021-10-22 14:10:15 +08:00
Phuong Nguyen Minh 060dde9827
Merge branch 'louislam:master' into master 2021-10-22 08:08:22 +07:00
DX37 1d1601cf24
Update notifications area in ru-RU.js 2021-10-21 22:49:17 +07:00
DX37 29e4e41215
Update ru-RU.js 2021-10-20 23:00:29 +07:00
MrEddX 6463d4b209
Fix: Integration Link Text 
Maybe left there from the Slack template.
 2021-10-20 09:09:08 +03:00
MrEddX d0b0c64b81
Update bg-BG.js 
- Fixed existing fields
- Added new fields
- Translated new fields
 2021-10-19 23:03:46 +03:00
Daniel Patrón Gómez 5a05d135b8
Add steam translation in spanish 2021-10-19 17:11:32 +02:00
Louis Lam e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges 
Text update
 2021-10-19 16:34:00 +08:00
Andreas Brett 7def9dcec7
Merge branch 'louislam:master' into patch-1 2021-10-19 00:37:15 +02:00
NeuralMiner a35569481d Updates 2021-10-18 15:26:38 -06:00
NeuralMiner 572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
NeuralMiner e1f1d4a959
Merge branch 'louislam:master' into textchanges 2021-10-18 12:57:28 -06:00
Louis Lam 182597944d fix #721 2021-10-19 00:19:26 +08:00
Lukas f74b2662c5 Fixed values for sms type 2021-10-18 12:02:54 +02:00
Louis Lam 300a95d779 recompile util.js with tsconfig.json 2021-10-18 17:51:40 +08:00
Louis Lam 16b44001e7 Merge remote-tracking branch 'andreasbrett/patch-1' into andreasbrett_patch-1 
# Conflicts:
#	src/util.js
 2021-10-18 17:35:17 +08:00
Louis Lam f2f8f33b86 Merge branch 'master' into andreasbrett_patch-1 
# Conflicts:
#	src/util.js
 2021-10-18 17:30:21 +08:00
Louis Lam 20d59e5a13 fix and move the steam api key to settings page 2021-10-18 17:02:05 +08:00
Louis Lam ae31eb6ba9 Merge branch 'master' into Revyn112_master 
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2021-10-18 15:50:35 +08:00
Andreas Brett df4682d19b
Merge branch 'master' into patch-1 2021-10-18 01:14:58 +02:00
Andreas Brett 11a1f35cc5 independent csprng solution 2021-10-18 01:06:20 +02:00
Louis Lam 6944b35ea7
Merge pull request #667 from zsxeee/i18n 
Missing i18n and zh-CN translation
 2021-10-16 22:47:58 +08:00
Daniel Patrón Gómez 0a73b84ae6 Add records translations and fix pause translation 2021-10-16 12:45:41 +02:00
Daniel Patrón Gómez 15f36f96c3 Add spanish translation for monitor history 2021-10-16 12:15:39 +02:00
Louis Lam edcaf93446
Merge pull request #721 from dpatrongomez/master 
Add Status Translation
 2021-10-16 17:41:46 +08:00
Daniel Patrón Gómez 53a008ae2b Add Status Translation 2021-10-16 11:32:15 +02:00
Bert Verhelst 61627545a5 fix(edit-monitor): no need to escape placeholder {} if not translated 2021-10-16 11:26:32 +02:00
Louis Lam cb43ecb46e Merge branch 'master' into background-jobs 
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
 2021-10-16 15:06:59 +08:00
NeuralMiner 8cb26d2b31 Text update 2021-10-15 19:12:09 -06:00
januridp d94fbede32 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:39:32 +07:00
januridp 76e619c066 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:36:07 +07:00
januridp 4e4f94ab98 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:29:51 +07:00
januridp ed3a558397 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:15:01 +07:00
Louis Lam f4b8da0a5c Merge branch 'feature/add-support-for-method-body-and-headers' 2021-10-15 19:02:49 +08:00
Louis Lam 4178983df3 Merge remote-tracking branch 'origin/master' 2021-10-15 19:01:04 +08:00
Louis Lam 7ac0ab2e34 [http options] beautify the json format when clicked the save button 2021-10-15 18:57:27 +08:00
Louis Lam cd211a6be7 [http options] fine tune 2021-10-15 18:36:40 +08:00
Louis Lam 4e71ab7406 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-15 16:07:05 +08:00
Phuong Nguyen Minh bda481c61e
Update vi.js 2021-10-15 08:26:33 +07:00
iooner 8242a1586d
Update fr-FR.js 2021-10-14 22:23:01 +02:00
Louis Lam c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject 
Add support for custom subject in emails
 2021-10-15 00:54:31 +08:00
Louis Lam 37105d720b
Merge pull request #706 from firattemel/master 
Update tr-TR.js
 2021-10-14 22:40:45 +08:00
Louis Lam 3b74b727f2 [Push Type] fix missing important flag and missing up notification 2021-10-14 22:32:15 +08:00
firattemel 2f0119bc3f Update tr-TR.js 2021-10-14 17:29:13 +03:00
Louis Lam 60acb91fc8
Merge pull request #687 from xjoker/master 
Add new notification `Aliyun Sms` and `DingDing`
 2021-10-14 17:02:23 +08:00
Louis Lam f51156f18e run eslint for #687 2021-10-14 16:24:03 +08:00
Louis Lam 8338881927 [SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements 2021-10-14 16:07:25 +08:00
Louis Lam 674b387c95 Merge branch 'master' into smtp-subject 2021-10-14 14:59:54 +08:00
xJoker 8ab4788f80
Update src/components/notifications/index.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-14 09:33:36 +08:00
xJoker 4e4ab0577e
Update src/components/notifications/index.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-14 09:33:31 +08:00
Lukas 89b34b5748 Use double curly brackets and sanity check for customSubject 2021-10-13 18:05:18 +02:00
Andreas Brett 86dcc9bc8f import webcrypto lib 2021-10-13 17:34:56 +02:00
Louis Lam 79c81395bc Merge branch 'master' into andreasbrett_patch-1 2021-10-13 22:02:27 +08:00
hrtkpf 84507268ad fix translations (de-DE and en) 2021-10-13 11:13:51 +02:00
wuwenjing 843992c410 Add DingDing notification 2021-10-13 16:13:46 +08:00
zsxeee 33f773fcd0
Move param out of the translation file 2021-10-13 15:36:07 +08:00
zsxeee 26841a64f0
Update zh-CN.js 2021-10-13 15:10:59 +08:00
Phuong Nguyen Minh 89c0f8b734
Update i18n.js 2021-10-13 13:44:31 +07:00
wuwenjing 57a76e6129 remove alicloud/pop-core keep simple 2021-10-13 14:41:59 +08:00
Phuong Nguyen Minh dc805cff97
Add files via upload 2021-10-13 13:36:09 +07:00
wuwenjing a2f2253221 Add aliyun sms notification 2021-10-13 11:55:01 +08:00
KangAlleW 2939bd4138 fix locale 2021-10-13 03:12:26 +07:00
KangAlleW dcf15c3eb7 edit i18n.js 2021-10-13 02:58:09 +07:00
KangAlleW 7c9ed98408 rename id.js to id-ID.js 2021-10-13 02:57:36 +07:00
KangAlleW 4b9f0a3fe6 add indonesian language and edit settings.vue 2021-10-13 02:53:46 +07:00
KangAlleW 5b67fec084 add indonesian language 2021-10-13 02:46:11 +07:00
Nelson Chan 03b07730d3 Fix: Increase default kept period 2021-10-12 23:28:21 +08:00
dhfhfk 05b691d4c9
Fix typo 2021-10-12 20:39:15 +09:00
Kyungyoon Kim c1112a32df
Update ko-KR.js 2021-10-12 18:19:44 +09:00
Kyungyoon Kim efc78acfeb
Update ko-KR.js 2021-10-12 18:17:13 +09:00
zsxeee 9e01959d15
Update zh-CN.js 2021-10-12 16:30:39 +08:00
zsxeee 3fe91c52cb
Fix i18n 
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
 2021-10-12 16:29:18 +08:00
Louis Lam b7528b9a4e
Merge pull request #657 from thomasleveil/patch-2 
[i18n] minor fixes to french translations
 2021-10-12 02:17:53 +08:00
Thomas LÉVEIL 9c058054b9 [i18n] minor update to french translations 2021-10-11 19:55:02 +02:00
Louis Lam c6683e2a9b
Merge pull request #648 from atlochowski/patch-1 
Update pl.js
 2021-10-12 00:04:33 +08:00
Atlochowski 69ffee55dd
Update pl.js 2021-10-11 14:33:00 +02:00
Atlochowski ebf0671fef
Update pl.js 2021-10-11 13:45:25 +02:00
wuwenjing 6d9b71c054 Add Feishu notification 2021-10-11 17:20:09 +08:00
Atlochowski a433de74e6
Update pl.js 
small fix
 2021-10-11 09:24:45 +02:00
Andreas Brett dc1de50a02 fix for max-inclusive 2021-10-11 01:18:33 +02:00
Andreas Brett 0e6d7694ce
Update util.js 2021-10-10 23:54:45 +02:00
Andreas Brett 503d1f0a91
translation fixes 2021-10-10 23:20:56 +02:00
Andreas Brett 11bcd1e2ed
const 2021-10-10 22:55:32 +02:00
Andreas Brett 06310423f4
typo 2021-10-10 22:19:10 +02:00
Andreas Brett e127e168b6
typed parameters 2021-10-10 22:15:42 +02:00
Andreas Brett 075535ba46
Update util.ts 2021-10-10 21:59:23 +02:00
Andreas Brett 13cf6891ac
cryptographically strong secret generation 
generate TOTP secret using WebCrypto API (see https://github.com/louislam/uptime-kuma/issues/640)
 2021-10-10 21:58:23 +02:00
Louis Lam ad0cde6554
Merge pull request #633 from dhfhfk/master 
Update ko-KR
 2021-10-11 01:04:32 +08:00
Louis Lam 25d18f0da3
Merge pull request #636 from DanielRTRD/add-norwegian-lang 
Add Norwegian Language
 2021-10-11 01:03:55 +08:00
RisedSky ecc25ba596
Update fr-FR.js 
Fixed wrong string
Also, "Primary Base URL" is missing from english file
 2021-10-10 19:02:35 +02:00
LouisLam e5286b0973 eslint for ko-KR.js 2021-10-11 00:52:46 +08:00
Daniel S. Billing 037fdd73a3 Norsk 2021-10-10 18:50:18 +02:00
Daniel S. Billing bb9a936658 Translated some of the notifications services 2021-10-10 18:49:03 +02:00
Bert Verhelst dc08510e72 Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-10 18:40:53 +02:00
Daniel S. Billing 62805014df Update Settings.vue 2021-10-10 18:38:19 +02:00
Daniel S. Billing c79e80442a Update i18n.js 2021-10-10 18:38:15 +02:00
Daniel S. Billing f0ff96afd9 Create nb-NO.js 2021-10-10 18:31:17 +02:00
RisedSky afb75e07d5
Update fr-FR.js 
Fixed string (Device => Appareil in French)
 2021-10-10 17:37:05 +02:00
RisedSky efd3822930
Update fr-FR.js 
All the lines corresponds to the English version (sorted correctly)
Plus, updated all the translated strings
 2021-10-10 17:33:02 +02:00
dhfhfk 2adac64c83
Update ko-KR.js 2021-10-11 00:02:37 +09:00
LouisLam 272d4bde45 find promossms language key typo 2021-10-10 13:19:10 +08:00
Louis Lam 0c88e4b2f6
Merge pull request #629 from NixNotCastey/pl-update 
Polish translation update
 2021-10-10 12:45:26 +08:00
Louis Lam 5c6230da58
Merge pull request #630 from xinac721/master 
Update Simplified Chinese Language（更新简体中文语言）
 2021-10-10 12:43:17 +08:00
新逸Cary 54f864a1bb Update Simplified Chinese Language（更新简体中文语言） 2021-10-10 10:04:07 +08:00
Lukas d6f7be9112 Translated all missing texts and updated few of previously translated. 2021-10-10 00:38:19 +02:00
Lukas 792f3c7c5c Add support for values of Name, Hostname and Status 2021-10-09 21:48:28 +02:00
Bert Verhelst 8a739af5ad Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-09 21:44:22 +02:00
Lukas edb75808d8
Merge branch 'louislam:master' into smtp-subject 2021-10-09 20:37:12 +02:00
Lukas 5e3ea3293c Very basic email subject customization 2021-10-09 20:32:45 +02:00
Louis Lam 1f7f20526f
Merge pull request #620 from MrEddX/bulgarian 
Update bg-BG.js
 2021-10-10 01:12:38 +08:00
Robin Schneider 6fe014fa5e
Fixed spelling for german language support 
Fixed spelling for german language support, hacktoberfest-accepted label woul be appreciated.
 2021-10-09 18:05:52 +02:00
Nelson Chan 6cf2eb036d Fix: Improve settings layout and wording 2021-10-09 23:51:05 +08:00
MrEddX 9d7def93a5
Update bg-BG.js 2021-10-09 18:44:12 +03:00
Nelson Chan dca5a59dbc Feat: Implement data clearing logic & frontend 2021-10-09 23:33:47 +08:00
Kyungyoon Kim 2e95e2016d
Translate to Korean 2021-10-09 05:25:49 -06:00
LouisLam cac0a46bac fix error if tls info object is in old format 2021-10-09 19:08:38 +08:00
Bert Verhelst d71d27220b fix(edit-monitor): store headers as JSON 2021-10-09 12:42:32 +02:00
Bert Verhelst b8093e909b fix(edit-monitor): fix minification of translations containing { } 2021-10-09 11:38:12 +02:00
Bert Verhelst c3c273f9df fix(edit-monitor): fix regex to allow a single header 2021-10-09 11:20:33 +02:00
Bert Verhelst daab2a05f5 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-09 11:13:16 +02:00
Daniel Patrón Gómez d7eac1a413
Update es-ES.js 2021-10-08 23:48:37 +02:00
LouisLam 5ce09953e2 use Segoe UI font for Windows among all languages 2021-10-08 20:15:54 +08:00
LouisLam fc8d1e78b6 [push type] hide upside down mode, apply primary base url 2021-10-08 20:03:52 +08:00
Louis Lam efb3f2b19c
Merge pull request #605 from NixNotCastey/promosms 
Add PromoSMS as notification provider
 2021-10-08 18:19:06 +08:00
LouisLam 11abc1f1e0 [test] add test for i18n currentLocale 2021-10-08 13:35:04 +08:00
LouisLam 288e87bb3d Merge branch 'master' into status-page-default-locale 2021-10-08 12:12:29 +08:00
LouisLam 8ae79ab9bf improve #560 2021-10-08 10:51:03 +08:00
Lukas 12b5489eb5 PromoSMS as Notification Provider 
Add PromoSMS (Polish SMS Gateway) as new notification provider
 2021-10-07 21:56:32 +02:00
LouisLam ddad2dcb4a Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/languages/en.js
 2021-10-08 01:40:34 +08:00
LouisLam e96121f69a fix merging mistake 2021-10-08 01:39:14 +08:00
LouisLam 5b4af550fb Merge branch 'master' into DeeJayPee_master 2021-10-08 01:27:06 +08:00
LouisLam 0fcb310b97 Merge remote-tracking branch 'Empty2k12/feature/matrix-notifications' into feature/matrix-notifications 
# Conflicts:
#	src/languages/en.js
 2021-10-08 01:13:09 +08:00
LouisLam 2ce5c28ed4 Merge branch 'master' into feature/matrix-notifications 
# Conflicts:
#	src/languages/en.js
 2021-10-08 00:59:39 +08:00
Bert Verhelst ec4b7e4064 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 18:22:59 +02:00
Kevin Petit 5b758a4e98 Better locale default for status page. 2021-10-07 18:07:24 +02:00
LouisLam adfe640f42 show fewer beat on mobile 2021-10-07 22:53:13 +08:00
LouisLam 9f1e7b0a88 Revert "fix(heartbeat-bar): cleanup css styling and minor syntax issues" 
This reverts commit 3d6c8b7f
 2021-10-07 21:47:11 +08:00
LouisLam cdf81a36d3 fix broken animation caused by #521 2021-10-07 21:42:36 +08:00
LouisLam 2c19aef4dc minor 2021-10-07 18:06:43 +08:00
LouisLam e5f6d7f047 slack and rocket.chat use the primary base url 
env var to show time logger
 2021-10-07 17:39:58 +08:00
LouisLam d08a71ab49 Set primary base url in settings page 2021-10-07 16:30:16 +08:00
LouisLam ed67803af8 improve minor style 2021-10-07 16:10:21 +08:00
Louis Lam 5eb3c6b194
Merge branch 'master' into bulgarian 2021-10-07 15:12:53 +08:00
LouisLam 8233f3b875 try to standardize the language name list 2021-10-07 15:06:16 +08:00
Bert Verhelst 8be4bf0e16 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 08:56:29 +02:00
LouisLam cccf393ee5 update zh-HK.js 2021-10-07 14:55:32 +08:00
MrEddX 9f5bf37a96
Update Settings.vue 2021-10-07 09:37:13 +03:00
MrEddX 1eb3f63a82
Update bg-BG.js 2021-10-07 09:27:05 +03:00
Louis Lam 8c63536eb8
Merge pull request #451 from zsxeee/notification_form_i18n 
Notification form i18n
 2021-10-07 14:13:08 +08:00
MrEddX 0c6b434d79
Moved Bulgarian to the Cyrillic family languages 2021-10-07 08:00:53 +03:00
Louis Lam b5bd92ce78
Merge pull request #578 from jtagcat/et5 
l10n: update et
 2021-10-07 11:31:02 +08:00
Bert Verhelst 162ef04c41 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-06 21:56:28 +02:00
Nelson Chan a87595a849
Fix: Allow underscore in hostname 2021-10-07 03:29:42 +08:00
jtagcat 7626e1f2e4 l10n: update et 2021-10-06 21:02:34 +03:00
zsxeee 7f1edb49bc
Fix i18n 
Upgrade vue-i18n to 9.1.9.
Fix wrong tag name.
 2021-10-07 00:04:13 +08:00
Gero Gerke d184733af9 update text 2021-10-06 13:44:36 +02:00
Gero Gerke 704d63b49f
Merge branch 'master' into feature/matrix-notifications 2021-10-06 13:36:28 +02:00
zsxeee 54d2fbcc02
Fix i18n 
Prevent use esm-bundler build vue-i18n
Escape keyword:  '@'
 2021-10-06 18:21:31 +08:00
Gero Gerke fbd4d54812
Update src/components/notifications/Matrix.vue 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-06 10:55:21 +02:00
LouisLam c8706b9aa1 Merge branch 'master' into notification_form_i18n 
# Conflicts:
#	src/components/notifications/SMTP.vue
#	src/languages/en.js
 2021-10-06 16:48:14 +08:00
Louis Lam 52102d72a0
Merge pull request #572 from Brainpitcher/patch-1 
Update ru-RU.js
 2021-10-06 15:28:29 +08:00
Louis Lam 8ea7a693a1
Merge pull request #499 from Saibamen/fix_pl_i18n 
Fix Polish language, add missing `Status Page` i18n
 2021-10-06 13:29:02 +08:00
Brainpitcher 7a8b6a03e0
Update ru-RU.js 
"Cert Exp.": "Сертификат истекает" now it sounds in russian
 2021-10-06 09:49:44 +05:00
Gero Gerke 6bebc623f9 UI polish 2021-10-05 21:59:58 +02:00
Gero Gerke 8c357a04bf
Update src/components/notifications/index.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-05 20:42:36 +02:00
DeeJayPee 044c78aa2d Typo \o/ 2021-10-05 20:16:16 +02:00
DeeJayPee 49eaa1a166 Typo fix 2021-10-05 20:13:24 +02:00
DeeJayPee 215cc07907 Rename versions 2021-10-05 20:12:36 +02:00
Gero Gerke 5decfb9fad Matrix Notifications 2021-10-05 20:03:56 +02:00
DeeJayPee f9d7b99367 Add legacy version back on refactored master branch 2021-10-05 20:01:07 +02:00
Bert Verhelst a0ffa42b42 fix(translations): add translations for method body and headers to dutch 2021-10-05 18:21:31 +02:00
Bert Verhelst 550825927c Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-05 18:19:07 +02:00
LouisLam 73bf1216d1 [wip] more test 2021-10-05 20:27:43 +08:00
Louis Lam 865b721b79
Merge pull request #519 from chakflying/improve-certInfo 
Feat: Improve Certificate Info Display
 2021-10-05 16:09:08 +08:00
Louis Lam 911690bea8
Merge pull request #521 from bertyhell/bugfix/heartbeat-bar-cleanup 
fix(heartbeat-bar): cleanup css styling and minor syntax issues
 2021-10-05 16:04:33 +08:00
LouisLam 259bcf9426 [SMTP] "To Email" is not required if CC/BCC is set. (#461) 2021-10-05 15:57:13 +08:00