Merge branch 'develop' into fix/be/incidents

Client/src/Pages/Settings/index.jsx

@@ -266,7 +266,7 @@ const Settings = () => {
 							open={isOpen.deleteStats}
 							theme={theme}
 							title="Do you want to clear all stats?"
-							description="Once deleted, this monitor cannot be retrieved."
+							description="Once deleted, your monitors cannot be retrieved."
 							onCancel={() => setIsOpen(deleteStatsMonitorsInitState)}
 							confirmationButtonLabel="Yes, clear all stats"
 							onConfirm={handleClearStats}
@@ -279,7 +279,7 @@ const Settings = () => {
 						<Box>
 							<Typography component="h1">Demo monitors</Typography>
 							<Typography sx={{ mt: theme.spacing(2) }}>
-								Here you can add and remove demo monitors
+								Here you can add and remove demo monitors.
 							</Typography>
 						</Box>
 						<Stack gap={theme.spacing(20)}>

README.md

@@ -58,15 +58,14 @@ If you have any questions, suggestions or comments, please use our [Discord chan
 **Short term roadmap:**
 
 - Port monitoring (**complete**, waiting to be deployed to stable version) https://github.com/bluewave-labs/Checkmate/issues/1476
-- Global (distributed) uptime checking on Solana network (**in progress**) 
+- Global (distributed) uptime checking on Solana network (**in progress**) https://github.com/bluewave-labs/Checkmate/issues/1593
 - Status pages (**in progress**) https://github.com/bluewave-labs/Checkmate/issues/1131 
 - Translations (i18n) (**in progress**)
-- Better notification options (Webhooks, Discord, Telegram, Slack) https://github.com/bluewave-labs/Checkmate/issues/1545
-- Server security monitoring 
-- Command line interface (CLI) https://github.com/bluewave-labs/Checkmate/issues/1558
+- Better notification options (Webhooks, Discord, Telegram, Slack) (**in progress**) https://github.com/bluewave-labs/Checkmate/issues/1545
+- Command line interface (CLI) (**in progress**) https://github.com/bluewave-labs/Checkmate/issues/1558
 - JSON query monitoring https://github.com/bluewave-labs/Checkmate/issues/1573
-- More configuration options
 - Tagging/grouping monitors https://github.com/bluewave-labs/Checkmate/issues/1546
+- More configuration options
 - DNS monitoring
 
 ## 🏗️ Screenshots