Adam Stachowicz
ea723c7595
Separate import and export. Fix ESLint
2021-09-12 21:35:37 +02:00
LouisLam
e205adfd7b
[status page] developing
2021-09-13 02:26:45 +08:00
LouisLam
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
2021-09-13 01:09:01 +08:00
LouisLam
7df9698e5d
eslint: comma-dangle for language files
2021-09-13 00:58:45 +08:00
Ponkhy
d313966d80
Merge branch 'master' into import-export
2021-09-12 18:46:11 +02:00
Louis Lam
2d7767c905
Merge pull request #392 from bertyhell/bugfix/button-margin-settings
...
fix(settings): add some button bottom margin for narrow screens
2021-09-12 23:49:21 +08:00
Louis Lam
e55193270d
Merge pull request #377 from Lrss/master
...
Fix: Inconsistent white-space for the "Avg."-Ping/Response title.
2021-09-12 23:48:29 +08:00
Louis Lam
9d39071a91
Merge pull request #363 from Ponkhy/2fa
...
Added simple TOTP Two Factor Authentication
2021-09-12 23:47:42 +08:00
Bert Verhelst
660b969178
fix(settings): switch custom styles to bootstrap class for bottom margin
2021-09-12 14:52:47 +02:00
Bert Verhelst
c26622aa39
fix(settings): add some button bottom margin for narrow screens
2021-09-12 13:40:07 +02:00
Ponkhy
7fee4a7ea7
Added import options
2021-09-11 21:53:17 +02:00
No0Vad
f8f9f59464
Added support for a retry interval to monitors
...
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
2021-09-11 18:54:55 +02:00
LouisLam
934685637a
[Status Page] WIP: Checkpoint
2021-09-11 23:43:07 +08:00
Ponkhy
8cd5bad44c
Merge branch 'master' into 2fa
2021-09-11 16:32:11 +02:00
Lars Sørensen
66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title.
2021-09-11 13:52:41 +02:00
LouisLam
3e25f0e9d9
[Status Page] WIP: Checkpoint
2021-09-11 19:40:03 +08:00
Nelson Chan
9e10f7d35f
Fix: Fix events table width on mobile
2021-09-11 18:56:27 +08:00
Adam Stachowicz
c387fb264e
Format JSON file before download
2021-09-11 10:50:56 +02:00
LouisLam
4b0a8087a2
do not connect to socket io for status page
2021-09-11 16:22:30 +08:00
Ponkhy
c62732fa9c
Minor translation fixes
2021-09-10 01:24:21 +02:00
Ponkhy
403202d4d4
Added simple TOTP Two Factor Authentication
2021-09-09 21:10:31 +02:00
LouisLam
573c7faddd
switch on the notification, if it is added in EditMonitor.vue
2021-09-09 21:24:29 +08:00
Ioma Taani
0f4bc5850b
Merge branch 'louislam:master' into italian-translation-update
2021-09-09 14:05:00 +02:00
Louis Lam
331ae5ec20
Merge pull request #306 from Ponkhy/import-export
...
Added import and export function
2021-09-09 16:15:48 +08:00
Ioma Taani
b54bbc302d
migliorata la traduzione
2021-09-08 21:34:48 +02:00
LouisLam
5a0fcebd6e
update link style
2021-09-08 18:59:30 +08:00
Louis Lam
325ce72a71
Merge pull request #352 from iomataani/italian-language
...
Italian language
2021-09-08 16:12:44 +08:00
Adam Stachowicz
f6a168282e
Route to monitor on DashboardHome
2021-09-08 09:55:08 +02:00
Ponkhy
acf6f1883b
Fixed missing spaces in backup file
2021-09-08 09:02:24 +02:00
Paride Barison
f44f951e40
Tradotte le ultime cose come richiesto
2021-09-08 08:41:19 +02:00
Louis Lam
d761d54d0e
Merge pull request #340 from Ponkhy/default-notification
...
Added the option for default notifications
2021-09-08 12:49:14 +08:00
LouisLam
e37621853e
Merge branch 'estonian'
...
# Conflicts:
# src/pages/Settings.vue
2021-09-08 11:00:19 +08:00
LouisLam
f2cec60481
minor
2021-09-08 10:48:03 +08:00
LouisLam
2212cf9c08
fix confirmDisableAuth no msg if not tranlated
2021-09-08 10:28:40 +08:00
Ponkhy
69a7c4dab4
Improved importBackup handling
2021-09-07 23:14:44 +02:00
jtagcat
2c3880a326
Added Estonian.
...
- "Avg.": using ≈, as it's commonly enough known.
There is no known shorthand for 'average' that I know of.
- Leaved some strings empty, as repeating the same words is useless, just noise.
2021-09-07 23:31:48 +03:00
LouisLam
1a5ffd4755
add description for export/import
2021-09-08 00:46:48 +08:00
LouisLam
62712f5cc4
Merge branch 'master' into import-export
2021-09-08 00:18:43 +08:00
LouisLam
0aeaf87f5b
Merge branch 'master' into default-notification
...
# Conflicts:
# server/notification.js
# src/components/NotificationDialog.vue
2021-09-07 23:40:42 +08:00
Louis Lam
850563442a
Merge pull request #349 from Ponkhy/redirect-after-setup
...
Auto login after setup
2021-09-07 21:16:54 +08:00
Ponkhy
242e494cb5
Merge branch 'master' into import-export
2021-09-07 14:12:53 +02:00
Ponkhy
4faa409027
Merge branch 'master' into default-notification
2021-09-07 14:07:50 +02:00
LouisLam
da131a5156
Merge branch 'master' into clear-monitor-data
...
# Conflicts:
# src/languages/da-DK.js
# src/languages/en.js
# src/languages/es-ES.js
# src/languages/fr-FR.js
# src/languages/ja.js
# src/languages/ko-KR.js
# src/languages/nl-NL.js
# src/languages/ru-RU.js
# src/languages/sr-latn.js
# src/languages/sr.js
# src/languages/sv-SE.js
# src/languages/zh-CN.js
# src/languages/zh-HK.js
2021-09-07 17:36:37 +08:00
Ponkhy
d01fa9bcfc
Auto login after setup
2021-09-07 10:25:25 +02:00
Ponkhy
bb8385d690
Merge branch 'default-notification' of https://github.com/Ponkhy/uptime-kuma into default-notification
2021-09-06 09:46:36 +02:00
Ponkhy
b95404b6e0
Fixed suggestions
2021-09-06 09:45:52 +02:00
Ponkhy
fd8c95d64e
Merge branch 'master' into default-notification
2021-09-05 23:32:31 +02:00
Ponkhy
58240aceef
Added the option for default notifications
2021-09-05 23:23:06 +02:00
Ponkhy
1b8b33c4c3
Added set language to the Setup.vue
2021-09-05 15:40:35 +02:00
Misly
9952463350
Add Polish Locale
2021-09-04 20:38:53 +00:00
