Louis Lam
5196abfd36
Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919
2022-12-05 17:52:02 +08:00
MrEddX
14a062804e
Update bg-BG.js
...
- Translation fixes
2022-11-25 22:00:52 +02:00
MrEddX
cf3e03ab40
Update bg-BG.js
...
- Added new fields
- Translated new fields
- Fixed some typos
2022-11-25 21:56:00 +02:00
Louis Lam
191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296
...
Add socks5h support
2022-11-25 16:24:21 +08:00
Joshua Brunner
cd270bd8b5
Add socks5h support
...
Add socks5h support as an extra option to not break previous socks5 implementation.
Allows to toggle between socks5 and socks5h explicit.
Fixes #2296
2022-11-22 11:18:16 +01:00
Matthew Nickson
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 19:04:14 +00:00
Matthew Nickson
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 18:46:58 +00:00
Jan Hartje
258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919
2022-11-14 20:17:36 +01:00
Ealrang
204015f1f5
Update zh-CN.js
...
Correct typos
2022-11-12 22:15:04 +08:00
Louis Lam
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2022-11-11 12:34:35 +08:00
Louis Lam
fd15e7c2dc
Merge remote-tracking branch 'origin/master' into ntfy-icon
...
# Conflicts:
# server/notification-providers/ntfy.js
# src/components/notifications/Ntfy.vue
# src/languages/en.js
2022-10-31 17:10:20 +08:00
Louis Lam
5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
...
Added support for SMSEagle device API notifications
2022-10-31 17:03:34 +08:00
Louis Lam
54efde8185
Update socket.io and remove an useless event listener
2022-10-29 23:29:33 +08:00
5idereal
1cb6940590
update zh-tw translation
2022-10-28 15:50:00 +08:00
Louis Lam
0f8ad288f3
Merge pull request #2255 from b-reich/update-german-translation
...
Add german translations
2022-10-27 16:47:11 +08:00
Adam Stachowicz
434174d350
I18n PL update ( #2264 )
...
* [PL] Only formatting by ESLint for now
* Translate new i18n keys to polish + small grammar/typo fixes
* ESLint again after npm install...
2022-10-27 16:46:32 +08:00
minhhn3
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
Benjamin Reich
f04fe4d230
add new german translations
2022-10-25 10:50:58 +02:00
Louis Lam
e579610426
Merge pull request #2265 from Saibamen/patch-1
...
Add info about `npm install` to translators
2022-10-25 14:32:43 +08:00
Adam Stachowicz
134b3b8ac1
Fix 'dayjs' is never used warning
2022-10-25 01:27:25 +02:00
Adam Stachowicz
e7e7751e7b
Correct order
2022-10-24 23:38:38 +02:00
Adam Stachowicz
5cd58e6fa3
Add info about npm install
to translators
...
Without this, you can have wrong indentation from ESLint
2022-10-24 23:36:21 +02:00
Marcin Kiszka
08763b700a
Added support for SMSEagle device API notifications
2022-10-24 12:45:56 +02:00
Denis Mishankov
7313aa6563
fix spaces
2022-10-17 20:36:52 +03:00
Denis Mishankov
c7871427c3
compute title value
2022-10-17 20:20:51 +03:00
Dave
c0e67b6de9
Update id-ID.js
2022-10-17 20:09:25 +07:00
Louis Lam
a17084f75d
Merge pull request #2229 from falentio/fix-id-lang
...
fix typos in id lang
2022-10-16 16:25:35 +08:00
falentio
5761bc9b90
fix typos in id lang
2022-10-16 13:49:25 +07:00
MrEddX
92ea019fd4
Update bg-BG.js
...
- Added new fields
- Translated new fields
2022-10-16 07:21:23 +03:00
Cyril59310
a774b37369
Update FR language + fixed daytime error ( #2226 )
...
* Update FR language
* fix a daytime error + add for translation
* Update language file FR + fixed daytime error
2022-10-16 01:42:28 +08:00
Louis Lam
64f84eb118
Update Details.vue's button styles
2022-10-15 21:01:48 +08:00
Louis Lam
6f4424de28
Remove unused language keys
2022-10-15 20:44:02 +08:00
Louis Lam
d8a676abb6
Implement recurring day of month and day of week
2022-10-15 18:49:09 +08:00
Louis Lam
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2022-10-15 15:57:39 +08:00
Louis Lam
c662d259b0
Firefox Better Support #2206
2022-10-13 19:28:02 +08:00
Matthew Nickson
f459ea845c
Added #2182 Add support for custom radius ports ( #2197 )
...
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-13 00:32:05 +08:00
MagicFun1241
cb5f90aa89
Update Russian locale ( #2218 )
...
* Update ru-RU.js
* Remove duplicates
* Remove duplicates x2
* Revert to previous version for one translation
* Removed conflicting lines
* Remove conflicting 'Reverse Proxy' key
2022-10-13 00:27:50 +08:00
Louis Lam
edacff123b
Add UTC in the serverTimezone dropdown
2022-10-12 22:13:07 +08:00
Louis Lam
2faf866e9e
Implement generateTimeslot() for recurring interval type
2022-10-12 17:02:16 +08:00
Louis Lam
8cc3e4b7c1
Revert
2022-10-11 22:28:00 +08:00
Louis Lam
dfb75c8afb
Update status page's maintenance message
2022-10-11 20:56:48 +08:00
Louis Lam
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
Christian Meis
1e8a16504b
Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
2022-10-11 11:15:33 +02:00
Alexander Borzov
180d881ac1
Update ru-RU.js ( #2217 )
2022-10-11 15:35:08 +08:00
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2022-10-11 14:52:47 +08:00
Louis Lam
d5c02fc627
Update Maintenance list order by status
2022-10-11 01:59:47 +08:00
Louis Lam
c84de4d259
WIP: Add maintenance status
2022-10-11 01:45:30 +08:00
Louis Lam
c1ccaa7a9f
WIP
2022-10-10 20:48:11 +08:00
Louis Lam
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2022-10-10 16:50:25 +08:00
Louis Lam
bd42450e55
Update vue-i18n from 9.1.9 to 9.2.2, force to use production version of vue-i18n in order to improve the performance
2022-10-10 16:23:32 +08:00
Louis Lam
a577fba848
Change DateTime Range using serverTimezone
2022-10-10 02:28:03 +08:00
Louis Lam
a36f24d827
Add configurable server timezone
2022-10-09 20:59:58 +08:00
Louis Lam
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2022-10-09 19:26:00 +08:00
Louis Lam
0d2e02f569
Merge pull request #2190 from VasilisThePikachu/master
...
Adding Greek Language
2022-10-09 02:48:32 +08:00
Kevin Falentio
230e5110b1
Fix typo in id-ID language file ( #2202 )
2022-10-08 20:59:22 +08:00
Matthew Nickson
f67d7cdf3f
Make update-language-files command more useful ( #2198 )
...
* [empty commit] pull request for Fix language update script
* Avoid mass changes with update-language-files
This commit updates the update-language-files script to prevent mass
changes as seen on a number of recent PRs where the contributer has
ran the script and comitted the results.
The script has been updated to now require the --language argument to
specify which language file to update. This ensures that only that file
is updated instead of all files. If the provided language code does not
already exist, a new file with that code is created. This should make
it easier to add new languages as you only need to pass the language
code to the script.
The base lang code is now also passed as an optional argument to negate
the need for a seperate script entry in package.json.
The script has been restructures into a couple of functions to make it
easier to understand.
ESlint now only checks the changed file instead of
them all in order to improve performance.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Updated translation docs for new command
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* [update-language-files] Add cross-env-shell
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-08 15:01:47 +08:00
wellart
df2f536845
[id-ID.js] Fix some type and word ( #2149 )
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-08 02:15:03 +08:00
Vasilis The Pikachu
59e7aa74a3
Remove some double dots & fix backuprecommended
2022-10-07 17:51:45 +00:00
AnnAngela
43c1ec640c
feat: 🌐 Update zh-cn and en translation ( #2167 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-08 01:45:00 +08:00
Louis Lam
4f6dec41c6
Fix ntfy username should not be required
2022-10-07 20:46:43 +08:00
Vasilis The Pikachu
e29527e22f
Update Greek
2022-10-07 11:33:29 +02:00
Vasilis The Pikachu
91f9e10c94
Merge branch 'louislam:master' into master
2022-10-07 10:55:42 +02:00
Vasilis The Pikachu
7d3cc002ea
Added greek language
2022-10-07 08:55:12 +00:00
janhartje
b879428a03
feat(notification): add additional Header to webhook
2022-10-05 17:48:07 +02:00
janhartje
3c5de1c889
Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919
2022-10-05 16:44:13 +02:00
CL0Pinette
528a615fb2
Add free.fr SMS notification provider ( #2159 )
2022-10-05 17:30:49 +08:00
Cyril59310
64ba2dce24
Update FR language ( #2173 )
2022-10-05 13:57:38 +08:00
Louis Lam
afbc283423
Move Cypress directory and convert it to JavaScript ( #2170 )
2022-10-04 22:23:57 +08:00
Louis Lam
c538983b87
Merge pull request #2169 from louislam/fix-docker-monitor
...
Fix Docker container monitor not working in 1.18.1
2022-10-04 17:47:56 +08:00
Louis Lam
0686757160
[Docker Monitor] Change tcp://
to http://
2022-10-04 16:19:56 +08:00
Louis Lam
25ea99a436
Merge pull request #2161 from 5idereal/patch-1
...
Update zh-tw translation
2022-10-03 20:53:13 +08:00
5idereal
c2c3f981bc
update zh-tw translation
2022-10-03 18:03:15 +08:00
Louis Lam
3e85893bdd
Merge remote-tracking branch 'origin/master' into squadcast-notification-support
...
# Conflicts:
# src/languages/en.js
2022-10-03 16:16:50 +08:00
Louis Lam
7672057319
[ntfy] Do not autofill
2022-10-03 15:51:29 +08:00
Louis Lam
0f99d49a27
Merge remote-tracking branch 'origin/master' into ntfy-auth-support
2022-10-03 15:30:00 +08:00
Louis Lam
894aeaea0a
Merge pull request #2158 from SametKUM/master
...
fix some translations
2022-10-03 15:16:15 +08:00
5idereal
d39a4770e0
sync
2022-10-03 13:11:39 +08:00
SametKUM
f6ac09b751
fix some translations
2022-10-02 21:14:00 +03:00
An | Anton Röhm
8595824b5d
Improve German translation
2022-10-02 13:49:40 +02:00
MrEddX
ed7bc0e6d1
Update bg-BG.js
...
Added New Fields
2022-10-02 09:55:58 +03:00
Matthew Nickson
f9be918246
Add support for MySQL/MariaDB databases #1817
...
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-02 01:52:53 +01:00
Matthew Nickson
314ae38f91
Changed name of SQL Server to avoid confusion
...
It appears that SQL Server causes some confusion among users as they
believe that it means any SQL database, not the Microsoft product SQL
Server. To avoid this issue, the display value has been changed to
Microsoft SQL Server. No backend changes have been made and it is still
stored as sqlserver in the database. This is only a frontent change.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 21:35:33 +01:00
FarisDaffa
929d238106
Update id-ID.js
2022-10-01 12:17:17 +07:00
Christian Meis
c03d911657
Update src/languages/en.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-09-28 11:39:13 +02:00
Christian Meis
6f86236b63
Add support for icon to ntfy notification provider (requires minimum ntfy server version 1.28.0 and Android app 1.14.0, no iOS support as of today)
2022-09-28 10:13:18 +02:00
Louis Lam
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2022-09-28 00:48:15 +08:00
Louis Lam
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2022-09-28 00:20:17 +08:00
Louis Lam
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2022-09-27 20:44:44 +08:00
Patrick
4157c7d546
Add support for Squadcast incoming webhook
2022-09-26 22:16:34 +13:00
Louis Lam
3f63cb246b
[WIP] Handle timezone offset for timeRange
2022-09-25 19:38:28 +08:00
Louis Lam
c3eef28443
Merge pull request #2122 from mjysci/test
...
feat: Add ServerChan Notification support
2022-09-25 15:01:58 +08:00
Louis Lam
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2022-09-24 19:18:24 +08:00
Louis Lam
9d99c39f30
Update Maintenance UI for recurring
2022-09-24 02:33:29 +08:00
MA Junyi
b03624b7e3
feat: Add ServerChan Notification support
2022-09-23 23:27:22 +08:00
Buchtič
c6cf600722
Update cs-CZ.js
...
localization improvements
2022-09-22 19:30:43 +02:00
Louis Lam
617ba49e6c
Fix race condition of selectedStatusPagesOptions
2022-09-18 22:40:53 +08:00
Louis Lam
7853c2cc38
Update Maintenance UI
2022-09-18 22:34:05 +08:00
Louis Lam
f61c1c47aa
Update Maintenance UI
2022-09-18 02:13:29 +08:00
Louis Lam
9fe07742ea
Linting
2022-09-18 02:07:32 +08:00
Louis Lam
a29eae3213
Update Maintenance UI
2022-09-18 02:02:18 +08:00