141 Commits (e12225e59548bc60827b39d1da01516ffbdaa057)

Author	SHA1	Message	Date
Louis Lam	bc86f8bb5f	Reset busy_timeout to default	2 years ago
minhhn3	b459408b10	fix: resolve conflict	2 years ago
Louis Lam	39b6725163	Update maintenance tables	2 years ago
Louis Lam	90761cf831	Merge remote-tracking branch 'origin/master' into karelkryda_master ... # Conflicts: # server/database.js # server/model/monitor.js # server/routers/api-router.js # server/server.js # src/components/HeartbeatBar.vue # src/components/MonitorList.vue # src/icon.js # src/layouts/Layout.vue # src/mixins/datetime.js # src/mixins/socket.js # src/router.js # src/util.js	2 years ago
minhhn3	6bb79597e8	fix: resolve merge conflict	2 years ago
Louis Lam	de6e1e7ddd	Merge remote-tracking branch 'origin/master' into introduce-resend-interval ... # Conflicts: # server/database.js	2 years ago
Louis Lam	3b3763351b	Merge remote-tracking branch 'origin/master' into radius-check ... # Conflicts: # server/database.js # server/model/monitor.js # server/server.js # server/util-server.js # src/pages/EditMonitor.vue	2 years ago
Louis Lam	aca395cea1	Merge pull request #1957 from jbenguira/patch-2 ... Avoid error "SQLITE_BUSY: database is locked"	2 years ago
Louis Lam	d0d1e0de28	Merge remote-tracking branch 'origin/master' into introduce-resend-interval ... # Conflicts: # src/pages/EditMonitor.vue	2 years ago
Minh Hoàng	dcecd10c88	Feat/add gRPC protocol (#1) ... * feat: added monitor with gRPC Co-authored-by: minhhn3 <minhhn3@vng.com.vn>	2 years ago
Joseph Benguira	d6a113396a	Update server/database.js ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2 years ago
Joseph Benguira	71d62ee151	removed ; after the PRAGMA command	2 years ago
Joseph Benguira	82b9bfc5a0	fixed Trailing spaces not allowed lint issue	2 years ago
Joseph Benguira	f016caa513	Avoid error "SQLITE_BUSY: database is locked" ... Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write	2 years ago
Moritz R	60e7824ff0	Merge branch 'master' into master	2 years ago
Louis Lam	baa592bce3	Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page	2 years ago
Louis Lam	1af6d33fcd	Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395	2 years ago
Matthew Nickson	f1d24782f8	Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page	2 years ago
OidaTiftla	869a040011	Merge branch 'master' into introduce-resend-interval	2 years ago
Moritz R	ac449ec1c2	Merge branch 'master' into master	2 years ago
Louis Lam	6682839ec8	Merge remote-tracking branch 'origin/master' into ntml-auth ... # Conflicts: # package-lock.json # package.json # server/database.js # server/model/monitor.js # server/server.js # server/util-server.js	2 years ago
Matthew Nickson	fbfa5a33ed	Added Clickable hostname on status page. #1221 ... This should fully implement #1221 by modifying the API and adding two new properties to the result. The `sendUrl` property denotes if the URL is sent and `url` is included when required. Client side checks have been implemented in order to only show a link when the URL is vaugely correct. I.e not "" or "https://". This prevents the link from being included if the monitor type is not HTTP without having to publicly expose the monitor type. The exposure of the URL is configuarable for each monitor on each status page by clicking on the link icon. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2 years ago
Moritz R	a9f3142cee	Merge branch 'master' into master	3 years ago
Christopher Pickering	ef73af391f	added option for ntlm authorization	3 years ago
Christopher Pickering	87f933df4f	added sqlserver monitor	3 years ago
Sascha Kruse	398ecb7666	add radius check	3 years ago
OidaTiftla	93050208bb	Merge database changes into single patch file	3 years ago
OidaTiftla	8e99cbf426	Merge branch 'master' into introduce-resend-interval	3 years ago
Karel Krýda	ed84e56a85	Merge remote-tracking branch 'origin_kuma/master' ... # Conflicts: # package-lock.json # server/database.js # server/model/monitor.js # server/routers/api-router.js # server/server.js # src/components/MonitorList.vue # src/components/PingChart.vue # src/icon.js # src/pages/DashboardHome.vue # src/pages/StatusPage.vue # src/router.js # src/util.js	3 years ago
Louis Lam	1687de163c	Merge pull request #1565 from Saibamen/eslint ... Fix some of ESLint warnings	3 years ago
Adam Stachowicz	1e595eaa76	Update linters	3 years ago
Matthew Nickson	4ddbf71920	Fixed trailing spaces in database.js ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	3 years ago
Matthew Nickson	6d22ebedca	Merge branch 'master' into add-JSDoc-comments	3 years ago
OidaTiftla	b7e2489d22	Merge branch 'master' into introduce-resend-interval	3 years ago
Matthew Nickson	03b2d8d521	Add JSDoc to server/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	3 years ago
Louis Lam	5fa62a888c	Merge branch 'master' into mqtt2 ... # Conflicts: # server/database.js # server/util-server.js	3 years ago
Louis Lam	8eb83394f7	Refine UI/UX for custom css / footer text. Add switch for show/hide powered by	3 years ago
Louis Lam	b1c7915bc1	Merge branch 'master' into mqtt2 ... # Conflicts: # package-lock.json # package.json # server/database.js # server/model/monitor.js # server/server.js # src/pages/EditMonitor.vue	3 years ago
Louis Lam	e9ce1433cd	Change log_info to log.info by making it into an object	3 years ago
Moritz R	361e44ad6a	Merge branch 'louislam:master' into master	3 years ago
Louis Lam	279e2eb3f6	Merge branch 'master' into logging ... # Conflicts: # server/database.js # server/jobs.js # server/model/monitor.js # server/routers/api-router.js # server/server.js # server/socket-handlers/status-page-socket-handler.js # server/util-server.js	3 years ago
Louis Lam	0afa0be5c2	Merge branch 'master' into status-page-domain ... # Conflicts: # server/database.js	3 years ago
Louis Lam	7bbaeffd3e	Fix reset-password (issue caused by 5027fcd320)	3 years ago
Louis Lam	fee88b32e3	Set PRAGMA synchronous = FULL	3 years ago
Louis Lam	70311f7a5a	Add an option to enable/disable the domain name expiry notification #1364	3 years ago
Moritz R	af44b0beab	Merge branch 'master' into master	3 years ago
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	3 years ago
OidaTiftla	91366ff565	Merge branch 'master' into introduce-resend-interval	3 years ago
Louis Lam	28d72fcd08	Fix #1409, slug cannot be empty	3 years ago
Louis Lam	8d981c8f0b	[Status Page] Fix migration and unpin incident	3 years ago