Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy ... # Conflicts: # package-lock.json # package.json # server/database.js # src/languages/en.js # src/mixins/socket.js		2022-04-01 14:57:35 +08:00
..
About.vue	Check beta release	2022-03-07 16:24:24 +08:00
Appearance.vue	[wip] lazy load language file	2021-11-26 16:31:19 +08:00
Backup.vue	WIP: Convert Settings to components	2021-11-17 10:45:18 +08:00
General.vue	[Status Page] Improved entry page	2022-03-17 22:44:47 +08:00
MonitorHistory.vue	Fix: Add save in monitor history	2021-11-17 10:45:19 +08:00
Notifications.vue	WIP: Convert Settings to components	2021-11-17 10:45:18 +08:00
Proxies.vue	Add socks proxy support to proxy feature	2022-03-06 19:34:51 +03:00
ReverseProxy.vue	Add package-lock.json and minor words	2022-03-30 18:52:10 +08:00
Security.vue	Minor fix for uk-UA	2022-03-31 16:19:04 +08:00