758 commits

Author	SHA1	Message	Date
Shihaam Abdul Rahman	eaa948579b	Fix typo in dashboard TCP Port times	2023-04-27 12:34:01 +05:00
Louis Lam	a7588adc52	Merge branch 'master' into grpc-patch	2023-04-11 18:55:27 +08:00
Louis Lam	af6e01ee3a	Merge pull request #3010 from chakflying/fix/grpc-invalid-regex ... Fix: Remove invalid gRPC url regex	2023-04-11 18:43:51 +08:00
Miles Steele	171aff1226	add invert keyword feature	2023-04-06 15:25:25 -05:00
Louis Lam	7706c29564	Minor	2023-04-04 15:42:37 +08:00
Louis Lam	9dd1b1ca0f	Merge remote-tracking branch 'origin/master' into show-tags-in-status-page-monitor-select-list ... # Conflicts: # src/pages/StatusPage.vue	2023-04-04 15:35:20 +08:00
Louis Lam	22f730499f	Improve the database connection string input	2023-04-03 02:57:14 +08:00
Louis Lam	1be74e2720	Merge pull request #2870 from chakflying/feat/auto-theme-status-page ... Feat: Support auto theme in status pages	2023-04-03 02:38:30 +08:00
Nelson Chan	97c7ad9cc7	Fix: Remove invalid gRPC url regex	2023-04-02 00:07:07 +08:00
Louis Lam	e8d48561fc	Change Retries from 0 to 1	2023-04-01 01:45:16 +08:00
Louis Lam	524cf7c607	WIP	2023-03-31 21:34:05 +08:00
Louis Lam	a6acd065bb	WIP	2023-03-31 20:58:45 +08:00
Louis Lam	227cec86a8	WIP	2023-03-31 20:25:37 +08:00
Louis Lam	02291730fe	WIP	2023-03-31 04:04:17 +08:00
Louis Lam	70572af1af	Fix #2969	2023-03-24 18:40:05 +08:00
Louis Lam	097567e5f0	Merge pull request #2878 from chakflying/feat/status-page-countdown ... Feat: Add status page countdown to refresh	2023-03-23 17:18:57 +08:00
Louis Lam	35f300c8eb	Improve and reuse language keys	2023-03-23 17:17:53 +08:00
Louis Lam	491239415e	Merge remote-tracking branch 'origin/master' into doubles-ss_master ... # Conflicts: # server/database.js	2023-03-12 18:38:19 +08:00
Nelson Chan	193a273557	Feat: Add status page countdown to refresh	2023-03-03 08:25:41 +08:00
Nelson Chan	150607cc93	Feat: Support auto theme in status pages	2023-03-02 07:26:26 +08:00
Nelson Chan	ad26f0e817	Fix: assign tags when cloning monitor	2023-03-02 06:44:16 +08:00
Godwin Gabriel Ndlovu	6fc34e44d9	Resolved issue with using IP Address as GRPC URL ... I've been having an issue with trying to use an IPAddress Host:Port combination in monitoring my GRPC instances. This was because the input type was set to url instead of text. Even if the pattern passes the match test, the url would block as it requires a fully qualified domain name with HTTP and this would fail to submit	2023-03-01 19:45:31 +02:00
Louis Lam	38ab5e0f3e	Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key ... Added #1685: Add API keys for API authentication	2023-02-28 16:55:50 +08:00
Matthew Nickson	11fa690e09	Updated API Keys UI ... The UI has now been moved to the settings page. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-02-26 18:07:57 +00:00
titanventura	db6b863445	show tags in monitor select list under status page : change select UI from normal select to vue-multiselect	2023-02-26 16:26:09 +05:30
Louis Lam	ea3b3abe36	Fine tune	2023-02-25 20:13:46 +08:00
Louis Lam	7f9332c753	Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor ... # Conflicts: # server/database.js # server/model/monitor.js # src/icon.js # src/languages/en.js # src/languages/es-ES.js	2023-02-25 19:14:44 +08:00
Louis Lam	f32d3af62c	Merge remote-tracking branch 'origin/master' into doubles-ss_master ... # Conflicts: # server/database.js	2023-02-25 17:57:25 +08:00
Louis Lam	8a115670cd	Fix label and id ... Co-authored-by: AlexKraus <alex.b.kraus@googlemail.com>	2023-02-25 17:55:40 +08:00
Louis Lam	4fed0c152e	Show Copy of in front of the cloned monitor name	2023-02-25 17:05:03 +08:00
Louis Lam	4a5a424198	Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor	2023-02-25 15:43:07 +08:00
Louis Lam	f47f2d5c87	Better save button for edit/add monitor page	2023-02-25 15:40:24 +08:00
Louis Lam	f0ae67f89a	Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor ... # Conflicts: # src/languages/en.js # src/pages/EditMonitor.vue	2023-02-25 14:56:51 +08:00
Louis Lam	46894793fc	Update Learn More url	2023-02-25 00:44:12 +08:00
Louis Lam	ef64077980	Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key ... # Conflicts: # src/lang/en.json	2023-02-25 00:06:25 +08:00
Louis Lam	cecb0b6425	Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors ... Add xml support to HTTP monitors	2023-02-24 17:26:47 +08:00
Nelson Chan	7c8cff7708	Fix: Add null check for injected HTML	2023-02-23 17:02:16 +08:00
Andreas Brett	372c6b9078	add markdown support for description	2023-02-20 16:09:17 +01:00
Faruk Genç	72106ba4c4	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors	2023-02-18 22:38:40 +03:00
Faruk Genç	3ab0faee91	Add update query for old monitors and save new data correctly	2023-02-18 22:18:48 +03:00
Faruk Genç	9e3a77f419	Customize body placeholder for body encoding	2023-02-18 17:02:56 +03:00
Peace	cef0a0faf4	Merge branch 'master' into group-monitors	2023-02-16 21:38:53 +01:00
Matthew Nickson	01c71a0242	Fixed logic errors, removed dev leftovers ... Fixed a logic error where a comma was used instead of an or, also removed leftover console.logs from testing. Date picker is now dissabled when don't expire is checked. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-02-15 11:15:15 +00:00
Matthew Nickson	05443f9bb7	Added language keys ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-02-14 22:16:41 +00:00
Matthew Nickson	d7f2fa982a	Merge branch 'master' into feature/1685-prometheus-api-key	2023-02-14 19:53:33 +00:00
Matthew Nickson	ee2eb5109b	Added basic web interface for API keys ... Web interfaces for manging API keys have been added however translation keys are still required. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-02-14 19:49:04 +00:00
Faruk Genç	19c8538149	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors	2023-02-11 23:56:38 +03:00
OidaTiftla	36d160ad02	Rename "consequently" to "consecutively" as suggested by @skylarv ... https://github.com/louislam/uptime-kuma/pull/1212#issuecomment-1423373045	2023-02-09 09:04:47 +01:00
Suriya Soutmun	43941fa2c6	feat: add mtls authen method in http/http keyword	2023-02-07 09:40:47 +07:00
Louis Lam	0197778af1	Fix change language issue in the setup page	2023-02-06 22:35:56 +08:00
Faruk Genç	39c99b0ec4	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors ... # Conflicts: # server/database.js # src/lang/en.json	2023-02-05 18:19:46 +03:00
cyril59310	5fff63cd59	add keys for translation	2023-02-05 01:07:20 +01:00
Louis Lam	10c6f3b688	Merge remote-tracking branch 'origin/master' into feature-google-analytics	2023-02-04 15:40:13 +08:00
Faruk Genç	666838f334	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors	2023-02-04 00:03:05 +03:00
c	99c0b8cb71	Feature - Google Analytics - Addressing PR Comments.	2023-02-02 21:51:03 +00:00
c	29e24e0de9	Feature - Added Optional Google Analytics tag for Status Page.	2023-02-02 21:51:03 +00:00
Faruk Genç	4287f7e885	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors ... # Conflicts: # src/lang/en.json	2023-02-02 19:43:17 +03:00
Peace	2c581ade90	Merge branch 'louislam:master' into group-monitors	2023-02-01 20:44:09 +01:00
Louis Lam	f82d7b4007	Merge remote-tracking branch 'origin/master' into feature/#2365-allow-markdown-in-status-page-footer ... # Conflicts: # package-lock.json # package.json # src/languages/en.js	2023-02-01 15:38:33 +08:00
Nelson Chan	95c934e08b	Fix: Do not allow white space around IP ... Feat: Trim input on submit Test: Add test for whitespace regex match	2023-02-01 08:25:16 +08:00
Faruk Genç	7dacc6a002	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors	2023-01-30 18:00:42 +03:00
Sebastian Kaempfe	a6894d36f2	[#2501] Dashboard: Details Page ... - enable clickable URL on Dashboard Details if monitor is of type `mp-health`	2023-01-30 15:55:12 +01:00
Louis Lam	664da4a317	Merge pull request #2684 from gitstart/UPTM-3 ... Save button can't be found while edit and add in Mobile version	2023-01-30 21:20:39 +08:00
Faruk Genç	064bc00f46	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors	2023-01-30 13:09:16 +03:00
Louis Lam	6828d337ae	Disable HTTP(s) - Browser Engine ... Reason: Unfortunately, after some test, I found that Playwright requires a lot of libraries to be installed on the Linux host in order to start Chrome or Firefox. It will be hard to install, so I hide this feature for now.	2023-01-30 00:00:41 +08:00
Peace	661fa87134	feat: make parent link clickable	2023-01-28 14:53:40 +01:00
Peace	d48eb24046	docs: more comments	2023-01-28 14:28:53 +01:00
Peace	aee4c22dee	perf: only do one filter instead of 3 in editMonitor	2023-01-28 14:28:34 +01:00
Peace	9a46b50989	docs: add comments	2023-01-28 14:22:15 +01:00
Peace	f3ac351d75	feat: set childs under maintenance if parent is too	2023-01-28 14:02:10 +01:00
Faruk Genç	35bd129d66	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors	2023-01-28 15:47:42 +03:00
Peace	aba515e172	feat: disable childs if parent is disabled	2023-01-28 13:39:17 +01:00
Peace	97bd306a09	Merge branch 'louislam:master' into group-monitors	2023-01-28 03:07:42 +01:00
Peace	645fd94bba	feat: add ability to group monitors in dashboard	2023-01-28 02:58:03 +01:00
Louis Lam	e5ca67d062	HTTPS Monitor using Real Browsers + Limited plugin support (#1787)	2023-01-27 18:25:57 +08:00
gitstart	54e63f3e25	Save button can't be found while edit and add in Mobile version	2023-01-26 12:47:33 +00:00
Faruk Genç	9329ec9234	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors ... # Conflicts: # server/database.js # server/model/monitor.js	2023-01-25 20:20:11 +03:00
Louis Lam	5050ebc249	Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size ... # Conflicts: # server/util-server.js # src/languages/en.js	2023-01-25 16:12:33 +08:00
Louis Lam	83e0401dd8	Show game list for GameDig monitor	2023-01-24 23:03:01 +08:00
Louis Lam	aab04f6644	Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master	2023-01-24 19:44:21 +08:00
Faruk Genç	86ba6f829e	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors	2023-01-20 12:27:28 +03:00
Louis Lam	c47b6c5995	Merge remote-tracking branch 'origin/1.19.X' ... # Conflicts: # package-lock.json # package.json # src/util-frontend.js	2023-01-17 21:17:04 +08:00
Louis Lam	31f45dcfc9	Merge pull request #2540 from twiggotronix/add-mqtt-schemes ... Add mqtt, mqtts, ws and wss protocols to the mqtt monitor	2023-01-15 20:14:11 +08:00
Louis Lam	49ac71e25c	Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05 ... Added missing JSDoc comments	2023-01-15 13:10:17 +08:00
Louis Lam	e48a987b9c	Merge remote-tracking branch 'origin/master' into mongodb-ping ... # Conflicts: # server/model/monitor.js # server/util-server.js # src/pages/EditMonitor.vue	2023-01-15 01:13:11 +08:00
Faruk Genç	cf21aa3737	Fix lint	2023-01-14 16:51:07 +03:00
Faruk Genç	9890a0754b	Fix lint	2023-01-14 16:48:26 +03:00
Faruk Genç	15c64d458b	Fix lint	2023-01-14 16:48:12 +03:00
Faruk Genç	be850dd596	Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors ... # Conflicts: # server/database.js # server/model/monitor.js # src/languages/en.js	2023-01-14 16:40:13 +03:00
Faruk Genç	3adc9e65d6	Add only xml support to http monitors	2023-01-14 16:33:21 +03:00
Louis Lam	6437ef198f	Merge pull request #2541 from long2ice/master ... feat: support redis monitor	2023-01-14 20:16:53 +08:00
long2ice	db757123ba	refactor: reuse databaseConnectionString	2023-01-13 16:32:49 +08:00
Nelson Chan	e9564619f1	Feat: Implement tags manager in settings ... Fix: Remove unused color options Chore: Fix typo	2023-01-12 21:25:33 +08:00
twiggotronix	8fab7112a1	Merge branch 'louislam:master' into add-mqtt-schemes	2023-01-11 10:34:24 +01:00
Matthew Nickson	6e50784b6b	Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer	2023-01-09 20:03:11 +00:00
Matthew Nickson	80f2d6e2a7	Added markdown support for maintenance ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-01-08 20:54:16 +00:00
Matthew Nickson	852a088529	Added mardown support for incident ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-01-08 20:46:18 +00:00
Matthew Nickson	6bc0bd84af	Allowed markdown in footer of status page ... Markdown support has been added using the marked module. To secure against XSS attacks, DOMPurify is used to sanitize the generated HTML before it is loaded on the page. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-01-08 20:39:27 +00:00
Matthew Nickson	32f7a0084a	Fixed negative retention time values ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2023-01-08 19:09:06 +00:00
Adam Spurgeon	774d754b21	Add GameDig monitor	2023-01-08 21:43:30 +13:00