Louis Lam 88ba9755a6 Resolve conflict

2024-06-26 10:02:39 +08:00

..

assets

Feat: Show monitor ID in Details (#4331)

2024-01-28 18:15:29 +08:00

components

Merge branch 'master' into 1.23.14-to-2.0.0

2024-06-26 10:00:30 +08:00

lang

Merge branch 'master' into 1.23.14-to-2.0.0

2024-06-26 10:00:30 +08:00

layouts

Fix: Correct colors

2024-02-20 17:52:59 +01:00

mixins

Feat: Use UptimeCalculator for PingChart (#4264)

2024-05-19 22:03:32 +02:00

modules/dayjs

Fix lint

2022-12-15 13:57:28 +08:00

pages

made sure that json-query for the mqtt monitor is translated properly

2024-05-23 14:48:12 +02:00

App.vue

Enforce semicolon, fix format globally

2022-04-14 01:20:54 +08:00

i18n.js

Merge branch '1.23.X' into 1.23.13-to-2.0.0

2024-04-25 15:42:53 +08:00

icon.js

Change Icon, Add missing var

2023-03-10 22:04:47 +07:00

main.js

Feat: Toast notification timeout settings (#3441)

2023-09-06 19:52:54 +08:00

router.js

Feature: remote browser support (#3904)

2023-12-01 15:29:10 +08:00

util-frontend.js

migrate timezones-list lib to @vvo/tzdb issue #4479 (#4521)

2024-03-03 17:54:14 +08:00

util.js

Resolve conflict

2024-06-26 10:02:39 +08:00

util.ts

Merge branch 'master' into 1.23.14-to-2.0.0

2024-06-26 10:00:30 +08:00