mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-01-07 11:57:48 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
1035 commits 33 branches 117 tags 72 MiB
Commit graph

192 commits

Author SHA1 Message Date
LouisLam db05b506f3 [status page] checkpoint 2021-09-15 14:34:30 +08:00
LouisLam afe91078c4 [status page] checkpoint 2021-09-14 23:27:11 +08:00
LouisLam 9902c181bc Merge branch 'master' into public-dashboard 
# Conflicts:
#	src/components/MonitorList.vue
#	src/icon.js
 2021-09-14 15:05:04 +08:00
Louis Lam 069c811af8
Merge pull request #278 from chakflying/tags 
Monitor: Tags with metadata
 2021-09-14 14:57:53 +08:00
LouisLam f9311e4e7f [status page] 2021-09-14 14:55:45 +08:00
LouisLam d7a230ac15 Merge branch 'master' into public-dashboard 
# Conflicts:
#	server/server.js
#	src/main.js
 2021-09-14 14:16:24 +08:00
LouisLam 9da2a01a74 [status page] checkpoint 2021-09-14 14:12:27 +08:00
LouisLam 76f1f34a0a fix #397, incorrect encode function for export file 2021-09-13 19:25:12 +08:00
LouisLam 35aca46b68 [status page] checkpoint 2021-09-13 19:21:39 +08:00
Nelson Chan 9b5abf9bb1 Fix: reset editMonitor after save 2021-09-13 14:12:17 +08:00
Nelson Chan 6e3a904aaa WIP: Add tags functionality 
WIP: add color column, show tags

WIP: Improve TagsManager styling & workflow

WIP: Improve styling & validation, use translation

WIP: Complete TagsManager functionality

WIP: Add tags display in monitorList & Details

Fix: update tags list after edit

Fix: slightly improve tags styling

Fix: Improve mobile UI

Fix: Fix tags not showing on create monitor

Fix: bring existingTags inside tagsManager

Fix: remove unused tags prop

Fix: Fix formatting, bump db version
 2021-09-13 14:12:11 +08:00
Ponkhy bb87972543 Hide 2FA section if disabled auth 2021-09-12 21:58:52 +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
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
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