You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		2 years ago
..
group.js	[Status Page] Simplify show tags logic	2 years ago
heartbeat.js	[status page] implement rest api for heartbeat	3 years ago
incident.js	[status page] many update and save group list	3 years ago
monitor.js	Merge branch 'master' into feature/request-with-http-proxy	2 years ago
proxy.js	Add http and https proxy feature	2 years ago
status_page.js	[Status Page] wip, upload logo and status page listing	2 years ago
tag.js	WIP: Add tags functionality	3 years ago
user.js	add reset password in cli	3 years ago