Louis Lam
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
...
Feat: Support auto theme in status pages
2 years ago
Nelson Chan
97c7ad9cc7
Fix: Remove invalid gRPC url regex
2 years ago
Louis Lam
e8d48561fc
Change `Retries` from `0` to `1`
2 years ago
Louis Lam
524cf7c607
WIP
2 years ago
Louis Lam
a6acd065bb
WIP
2 years ago
Louis Lam
227cec86a8
WIP
2 years ago
Louis Lam
02291730fe
WIP
2 years ago
Louis Lam
70572af1af
Fix #2969
2 years ago
Louis Lam
097567e5f0
Merge pull request #2878 from chakflying/feat/status-page-countdown
...
Feat: Add status page countdown to refresh
2 years ago
Louis Lam
35f300c8eb
Improve and reuse language keys
2 years ago
Louis Lam
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
Nelson Chan
193a273557
Feat: Add status page countdown to refresh
2 years ago
Nelson Chan
150607cc93
Feat: Support auto theme in status pages
2 years ago
Nelson Chan
ad26f0e817
Fix: assign tags when cloning monitor
2 years ago
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
2 years ago
Louis Lam
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2 years ago
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>
2 years ago
titanventura
db6b863445
show tags in monitor select list under status page : change select UI from normal select to vue-multiselect
2 years ago
Louis Lam
ea3b3abe36
Fine tune
2 years ago
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
2 years ago
Louis Lam
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
Louis Lam
8a115670cd
Fix label and id
...
Co-authored-by: AlexKraus <alex.b.kraus@googlemail.com>
2 years ago
Louis Lam
4fed0c152e
Show `Copy of` in front of the cloned monitor name
2 years ago
Louis Lam
4a5a424198
Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
2 years ago
Louis Lam
f47f2d5c87
Better save button for edit/add monitor page
2 years ago
Louis Lam
f0ae67f89a
Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
...
# Conflicts:
# src/languages/en.js
# src/pages/EditMonitor.vue
2 years ago
Louis Lam
46894793fc
Update Learn More url
2 years ago
Louis Lam
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2 years ago
Louis Lam
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
2 years ago
Nelson Chan
7c8cff7708
Fix: Add null check for injected HTML
2 years ago
Andreas Brett
372c6b9078
add markdown support for description
2 years ago
Faruk Genç
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Faruk Genç
3ab0faee91
Add update query for old monitors and save new data correctly
2 years ago
Faruk Genç
9e3a77f419
Customize body placeholder for body encoding
2 years ago
Peace
cef0a0faf4
Merge branch 'master' into group-monitors
2 years ago
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>
2 years ago
Matthew Nickson
05443f9bb7
Added language keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
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>
2 years ago
Faruk Genç
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2 years ago
OidaTiftla
36d160ad02
Rename "consequently" to "consecutively" as suggested by @skylarv
...
https://github.com/louislam/uptime-kuma/pull/1212#issuecomment-1423373045
2 years ago
Suriya Soutmun
43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
Louis Lam
0197778af1
Fix change language issue in the setup page
2 years ago
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
2 years ago
cyril59310
5fff63cd59
add keys for translation
2 years ago
Louis Lam
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2 years ago
Faruk Genç
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
c
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2 years ago
c
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2 years ago
Faruk Genç
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
2 years ago
Peace
2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
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
2 years ago
Nelson Chan
95c934e08b
Fix: Do not allow white space around IP
...
Feat: Trim input on submit
Test: Add test for whitespace regex match
2 years ago
Faruk Genç
7dacc6a002
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Sebastian Kaempfe
a6894d36f2
[ #2501 ] Dashboard: Details Page
...
- enable clickable URL on Dashboard Details if monitor is of type `mp-health`
2 years ago
Louis Lam
664da4a317
Merge pull request #2684 from gitstart/UPTM-3
...
Save button can't be found while edit and add in Mobile version
2 years ago
Faruk Genç
064bc00f46
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
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.
2 years ago
Peace
661fa87134
feat: make parent link clickable
2 years ago
Peace
d48eb24046
docs: more comments
2 years ago
Peace
aee4c22dee
perf: only do one filter instead of 3 in editMonitor
2 years ago
Peace
9a46b50989
docs: add comments
2 years ago
Peace
f3ac351d75
feat: set childs under maintenance if parent is too
2 years ago
Faruk Genç
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Peace
aba515e172
feat: disable childs if parent is disabled
2 years ago
Peace
97bd306a09
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace
645fd94bba
feat: add ability to group monitors in dashboard
2 years ago
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2 years ago
gitstart
54e63f3e25
Save button can't be found while edit and add in Mobile version
2 years ago
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
2 years ago
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
2 years ago
Louis Lam
83e0401dd8
Show game list for GameDig monitor
2 years ago
Louis Lam
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
Faruk Genç
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2 years ago
Louis Lam
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
Louis Lam
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
...
Added missing JSDoc comments
2 years ago
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
2 years ago
Faruk Genç
cf21aa3737
Fix lint
2 years ago
Faruk Genç
9890a0754b
Fix lint
2 years ago
Faruk Genç
15c64d458b
Fix lint
2 years ago
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
2 years ago
Faruk Genç
3adc9e65d6
Add only xml support to http monitors
2 years ago
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2 years ago
long2ice
db757123ba
refactor: reuse databaseConnectionString
2 years ago
Nelson Chan
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2 years ago
twiggotronix
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
Matthew Nickson
6e50784b6b
Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer
2 years ago
Matthew Nickson
80f2d6e2a7
Added markdown support for maintenance
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
852a088529
Added mardown support for incident
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
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>
2 years ago
Matthew Nickson
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Adam Spurgeon
774d754b21
Add GameDig monitor
2 years ago
Matthew Nickson
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
David Twigger
e490ec6d29
move hostname regex pattern function to frontend-utils
2 years ago
Matthew Nickson
dc8289df12
Added JSDoc for src/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
fc5ec5f492
Fixed styling of clear data dropdown
...
Fixed #2419
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
long2ice
40ebc2df79
feat: support redis monitor
2 years ago
David Twigger
abf5e435fe
move to utility function
2 years ago
David Twigger
8a372201f1
clean up
2 years ago
David Twigger
5362aab0e5
specify scheme for mqtt monitor type only
2 years ago
David Twigger
fc1914bccd
Fix lint
2 years ago
David Twigger
c196c34840
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
Mathias Haugsbø
239910a27c
Change clone icon from plus to clone
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
Mathias Haugsbø
608e3f5582
Feature: Clone existing monitor
...
Closes #565
Closes #2319
Adds the feature of cloning existing monitor, I have briefly tested it with ping and https and ensured that all properties was cloned including notifications.
2 years ago
Cyril59310
4862bec965
Update Fr language + added variable for missing translation ( #2395 )
...
* Update FR language
2 years ago
Louis Lam
3b87209e26
Add configurable dns cache
2 years ago
Louis Lam
e6dc0a0293
Slightly improve maintenance page's css on mobile
2 years ago
Louis Lam
5c5a339a36
Add links for status pages and maintenance for mobile ( Fix #2257 )
2 years ago
Louis Lam
4cd5b5563f
Fix #1145
2 years ago
Matthew Nickson
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
rmarops
b059a36e66
added MongoDB ping monitor
2 years ago
minhhn3
b459408b10
fix: resolve conflict
2 years ago
Matthew Nickson
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
Cyril59310
a774b37369
Update FR language + fixed daytime error ( #2226 )
...
* Update FR language
* fix a daytime error + add for translation
* Update language file FR + fixed daytime error
2 years ago
Louis Lam
64f84eb118
Update Details.vue's button styles
2 years ago
Louis Lam
d8a676abb6
Implement recurring day of month and day of week
2 years ago
Louis Lam
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
Matthew Nickson
f459ea845c
Added #2182 Add support for custom radius ports ( #2197 )
...
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
2faf866e9e
Implement generateTimeslot() for recurring interval type
2 years ago
Louis Lam
dfb75c8afb
Update status page's maintenance message
2 years ago
Louis Lam
e07aa982c3
WIP
2 years ago
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2 years ago
Louis Lam
d5c02fc627
Update Maintenance list order by status
2 years ago
Louis Lam
c84de4d259
WIP: Add maintenance status
2 years ago
Louis Lam
c1ccaa7a9f
WIP
2 years ago
Louis Lam
a577fba848
Change DateTime Range using serverTimezone
2 years ago
Matthew Nickson
f9be918246
Add support for MySQL/MariaDB databases #1817
...
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
314ae38f91
Changed name of SQL Server to avoid confusion
...
It appears that SQL Server causes some confusion among users as they
believe that it means any SQL database, not the Microsoft product SQL
Server. To avoid this issue, the display value has been changed to
Microsoft SQL Server. No backend changes have been made and it is still
stored as sqlserver in the database. This is only a frontent change.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2 years ago
Justin Tisdale
f6919aef1d
remove TODO
2 years ago
Justin Tisdale
0814d643c1
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Louis Lam
3f63cb246b
[WIP] Handle timezone offset for timeRange
2 years ago
Louis Lam
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2 years ago
Louis Lam
9d99c39f30
Update Maintenance UI for recurring
2 years ago
Louis Lam
617ba49e6c
Fix race condition of `selectedStatusPagesOptions`
2 years ago
Louis Lam
7853c2cc38
Update Maintenance UI
2 years ago
Louis Lam
f61c1c47aa
Update Maintenance UI
2 years ago
Louis Lam
9fe07742ea
Linting
2 years ago
Louis Lam
a29eae3213
Update Maintenance UI
2 years ago
Louis Lam
80698a58b8
Tidy up
2 years ago
Louis Lam
bb883e6fa0
Move maintenance under `/maintenance`
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
Matthew Nickson
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
d3vyce
7577477ae8
Add rel="noopener noreferrer" to html link
2 years ago
Louis Lam
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2 years ago
Justin Tisdale
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Matthew Nickson
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
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
Justin Tisdale
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Justin Tisdale
2b9bf095a6
Add non-json support for http body
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
Justin Tisdale
3a18801722
Add Body Encoding field
2 years ago
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
minhhn3
2232236a7a
[empty commit] pull request for add gRPC protocol
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
Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
Louis Lam
bea8679788
Merge branch 'master' into issue-1861
2 years ago
c0derMo
1062e629c5
Fix linting issues
2 years ago
Moritz R
60e7824ff0
Merge branch 'master' into master
2 years ago
c0derMo
fb3b407577
Added a settings page & localization
2 years ago
Louis Lam
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
tamasmagyar
31c388a6e3
added cypress framework and tests for setup page
2 years ago
Matthew Nickson
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Chongyi Zheng
6ce012c9a1
Add trust proxy checkbox in Settings page
2 years ago
Louis Lam
c36d9a4b8b
Fix port data type #1802
2 years ago
Louis Lam
a7063b8aca
Fix logo height in the status page list
2 years ago
sur.la.route
4b2a465c94
Fix order of type and placeholder
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Christopher Pickering
945288f0c0
Added postgres monitor
2 years ago
OidaTiftla
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
Christopher Pickering
42848bcd2e
updated translations
2 years ago
Louis Lam
a3b94aa532
Merge pull request #1550 from Computroniks/jsdoc-for-src
...
JSDoc for src/*/*
2 years ago
Moritz R
ac449ec1c2
Merge branch 'master' into master
2 years ago
Louis Lam
da91317760
Merge pull request #1772 from chakflying/fix/mobile-monitor-list
...
Fix: Fix monitor list layout on mobile
2 years ago
Louis Lam
7d63b700e1
Merge pull request #1767 from christopherpickering/patch-2
...
[beta] workstation field should be text, not password
2 years ago
Nelson Chan
62acd2edb1
Fix: misc. layout fix on mobile
2 years ago
Christopher Pickering
483cbfb636
added default value for sql server connection string
2 years ago
sur.la.route
6995a29980
workstation field should be text, not password
2 years ago
Nelson Chan
e425e408a2
Fix: Fix missing default settings
2 years ago
Louis Lam
d16be6fb7d
Fix and use null as authMethod None instead of empty string
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
Louis Lam
817f6db4fd
Remove SQL Server code (which in another pr already)
2 years ago
Louis Lam
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2 years ago
Louis Lam
f4f2b8ddb8
Try to fix #1658
2 years ago
Louis Lam
d4485fe62f
Make the monitor type list a bit clear
2 years ago
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
3 years ago
Louis Lam
6ee7b3696a
Merge pull request #1633 from domingospanta/bugfix/1451_blank_page_on_unkown_resource
...
Bugfix/1451 blank page on unkown resource
3 years ago
Matthew Nickson
0e28707307
Minor formatting for JSDoc comments
...
Added a number of minor formatting changes to JSDoc comments in /src
3 years ago
Matthew Nickson
b0476cfb5b
Added JSDoc for src/pages/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
091158cfe7
[Status Page] Preload data
3 years ago
Nelson Chan
26ff6f45a0
Feat: Use i18n pluralization
3 years ago
Louis Lam
c095767f4a
[Status Page] SSR
3 years ago
Moritz R
e9e78c26e5
Merge branch 'master' into master
3 years ago
Louis Lam
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
3 years ago
Domingos F. Panta Jr
73b965c867
Merge branch 'master' into bugfix/1451_blank_page_on_unkown_resource
3 years ago