| 
							
							
								 LouisLam | 6006038689 | fix monitor.stop() in some cases | 2021-09-08 20:00:16 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | a7b50c3630 | Revert "add user-monitor-list" This reverts commit 230a9bfaf9. | 2021-09-08 19:54:38 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 0ddbac5109 | Revert "move userMonitorList out of server.js" This reverts commit a7cf14c663. | 2021-09-08 19:54:38 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 0f440596c8 | Revert "cache last heartbeat list in memory" This reverts commit 87678ea92d. | 2021-09-08 19:54:37 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 87678ea92d | cache last heartbeat list in memory | 2021-09-08 18:58:02 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | a7cf14c663 | move userMonitorList out of server.js | 2021-09-08 16:27:37 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 230a9bfaf9 | add user-monitor-list | 2021-09-08 14:16:30 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 1ef4562905 | Paused monitors stay paused after import | 2021-09-07 23:32:25 +02: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 |  | 
			
				
					| 
							
							
								 LouisLam | da74391c3e | convert notifications into modules | 2021-09-07 22:42:46 +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 |  | 
			
				
					| 
							
							
								 LouisLam | da131a5156 | Merge branch 'master' into clear-monitor-data # Conflicts:
#	src/languages/da-DK.js
#	src/languages/en.js
#	src/languages/es-ES.js
#	src/languages/fr-FR.js
#	src/languages/ja.js
#	src/languages/ko-KR.js
#	src/languages/nl-NL.js
#	src/languages/ru-RU.js
#	src/languages/sr-latn.js
#	src/languages/sr.js
#	src/languages/sv-SE.js
#	src/languages/zh-CN.js
#	src/languages/zh-HK.js | 2021-09-07 17:36:37 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | fd8c95d64e | Merge branch 'master' into default-notification | 2021-09-05 23:32:31 +02:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 58240aceef | Added the option for default notifications | 2021-09-05 23:23:06 +02:00 |  | 
			
				
					| 
							
							
								 Louis Lam | f9c177b150 | Merge pull request #315 from tgxn/patch-1 Notifications Content Improvements: SMTP, LunaSea, PushBullet | 2021-09-05 11:52:50 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 299506ce45 | reset the heartbeat list instead of reload the page after cleared events or heartbeats | 2021-09-05 02:03:40 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | 41d32bb9dd | Undo parm changes | 2021-09-04 20:08:18 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | b0acda52f9 | Add time to smtp body content | 2021-09-04 11:27:18 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | e9cd9be03a | Use constants for UP/DOWN through notifications class | 2021-09-04 11:09:34 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | 6ae279c7f3 | Move title generation to notification class | 2021-09-04 11:06:06 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | 9c32adfb55 | Update pushbullet down body Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> | 2021-09-04 18:26:44 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | d346afd33b | Update pushbullet up body Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> | 2021-09-04 18:26:38 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | 3bf380c684 | Update lunasea "up" body content Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> | 2021-09-04 18:26:10 +08:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | dca5c59982 | Update lunasea body content Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> | 2021-09-04 18:24:43 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 8f9a973ede | Merge branch 'master' into import-export | 2021-09-04 01:26:48 +02:00 |  | 
			
				
					| 
							
							
								 LouisLam | ebf362754c | Merge branch 'master' into clear-monitor-data | 2021-09-03 14:56:43 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | e31be8caf5 | demo mode | 2021-09-02 22:52:20 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 60f2f08cea | add demo db | 2021-09-02 22:39:04 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | b1647a310e | add demo db | 2021-09-02 22:37:51 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 7d70c4d8cd | Code optimizations | 2021-09-02 16:13:31 +02:00 |  | 
			
				
					| 
							
							
								 Domenic Horner | 532ad3044c | Add space to pushbullet and lunasea notifications Start changes regarding standardization of notification messages | 2021-09-02 21:55:25 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | f23ecef636 | add missing cert parameters | 2021-09-02 21:16:04 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 51cf2ff6f9 | add missing cert parameters | 2021-09-02 21:13:59 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | b30b1d3a52 | create data dir before copy | 2021-09-02 21:11:20 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 582e14098d | create data dir before copy | 2021-09-02 21:10:18 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 6e3e2fc85c | fix db path | 2021-09-02 21:08:00 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | b604807cfe | create data dir if not exists | 2021-09-02 20:42:55 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | 3ee13bddd1 | dash style for args | 2021-09-02 20:36:52 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | c74986647e | allow changing data dir | 2021-09-02 20:27:18 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | b88b357b55 | add support for https | 2021-09-02 20:18:27 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 2dd392e609 | Added uptime kuma version to backup file | 2021-09-02 10:15:25 +02:00 |  | 
			
				
					| 
							
							
								 Ponkhy | c13cc62d3d | Update server/server.js Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com> | 2021-09-01 21:32:33 +02:00 |  | 
			
				
					| 
							
							
								 Ponkhy | b604910bbb | Merge branch 'master' into clear-monitor-data | 2021-09-01 17:17:40 +02:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 2f6c5963c5 | Added import and export function | 2021-09-01 17:09:32 +02:00 |  | 
			
				
					| 
							
							
								 LouisLam | e4b76717be | revert back to node-sqlite3 | 2021-09-01 15:02:04 +08:00 |  | 
			
				
					| 
							
							
								 LouisLam | cd1a3a2fb9 | revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems | 2021-09-01 14:33:00 +08:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 7b92166d18 | Added clear all db statistics function | 2021-09-01 00:36:24 +02:00 |  | 
			
				
					| 
							
							
								 Ponkhy | 1341d220ed | Merge branch 'louislam:master' into clear-monitor-data | 2021-08-31 23:22:45 +02:00 |  |