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
|
2022-09-17 16:12:57 +08:00 |
|
d3vyce
|
7577477ae8
|
Add rel="noopener noreferrer" to html link
|
2022-09-10 21:35:22 +02:00 |
|
Louis Lam
|
197d44981f
|
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
# Conflicts:
# package.json
|
2022-09-09 16:32:23 +08:00 |
|
Louis Lam
|
de6e1e7ddd
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# server/database.js
|
2022-08-13 13:24:00 +08:00 |
|
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
|
2022-08-11 21:08:06 +08:00 |
|
Louis Lam
|
d0d1e0de28
|
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
# Conflicts:
# src/pages/EditMonitor.vue
|
2022-08-05 15:40:06 +08:00 |
|
Louis Lam
|
70aa8fe453
|
Merge pull request #1183 from c0derMo/master
Adding option to monitor other docker containers
|
2022-08-02 19:08:46 +08:00 |
|
Louis Lam
|
bea8679788
|
Merge branch 'master' into issue-1861
|
2022-07-31 20:06:45 +08:00 |
|
c0derMo
|
1062e629c5
|
Fix linting issues
|
2022-07-24 12:50:43 +00:00 |
|
Moritz R
|
60e7824ff0
|
Merge branch 'master' into master
|
2022-07-24 14:37:22 +02:00 |
|
c0derMo
|
fb3b407577
|
Added a settings page & localization
|
2022-07-24 12:34:43 +00:00 |
|
Louis Lam
|
88afd662db
|
Merge remote-tracking branch 'origin/master' into postgres
# Conflicts:
# package-lock.json
# package.json
|
2022-07-24 14:07:30 +08:00 |
|
c0derMo
|
0d098b0958
|
Docker Hosts are now a table & have their own dialog
|
2022-07-22 15:47:04 +00:00 |
|
tamasmagyar
|
31c388a6e3
|
added cypress framework and tests for setup page
|
2022-07-18 20:51:13 +02:00 |
|
Chongyi Zheng
|
6ce012c9a1
|
Add trust proxy checkbox in Settings page
|
2022-07-12 22:45:54 -04:00 |
|
Louis Lam
|
c36d9a4b8b
|
Fix port data type #1802
|
2022-06-21 22:33:09 +08:00 |
|
Louis Lam
|
a7063b8aca
|
Fix logo height in the status page list
|
2022-06-21 15:46:22 +08:00 |
|
sur.la.route
|
4b2a465c94
|
Fix order of type and placeholder
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-06-15 20:14:06 -05:00 |
|
Christopher Pickering
|
945288f0c0
|
Added postgres monitor
|
2022-06-15 12:12:47 -05:00 |
|
OidaTiftla
|
ac27e6e2af
|
Rename feature to: Resend Notification if Down X times consequently
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
|
2022-06-15 17:50:35 +02:00 |
|
OidaTiftla
|
869a040011
|
Merge branch 'master' into introduce-resend-interval
|
2022-06-15 16:19:47 +02:00 |
|
Christopher Pickering
|
42848bcd2e
|
updated translations
|
2022-06-15 09:00:47 -05:00 |
|
Louis Lam
|
a3b94aa532
|
Merge pull request #1550 from Computroniks/jsdoc-for-src
JSDoc for src/*/*
|
2022-06-15 19:29:51 +08:00 |
|
Moritz R
|
ac449ec1c2
|
Merge branch 'master' into master
|
2022-06-15 11:33:00 +02:00 |
|
Louis Lam
|
da91317760
|
Merge pull request #1772 from chakflying/fix/mobile-monitor-list
Fix: Fix monitor list layout on mobile
|
2022-06-15 15:50:04 +08:00 |
|
Louis Lam
|
7d63b700e1
|
Merge pull request #1767 from christopherpickering/patch-2
[beta] workstation field should be text, not password
|
2022-06-15 15:31:24 +08:00 |
|
Nelson Chan
|
62acd2edb1
|
Fix: misc. layout fix on mobile
|
2022-06-14 22:43:44 +08:00 |
|
Christopher Pickering
|
483cbfb636
|
added default value for sql server connection string
|
2022-06-14 09:00:23 -05:00 |
|
sur.la.route
|
6995a29980
|
workstation field should be text, not password
|
2022-06-14 07:45:04 -05:00 |
|
Nelson Chan
|
e425e408a2
|
Fix: Fix missing default settings
|
2022-06-14 15:04:14 +08:00 |
|
Louis Lam
|
d16be6fb7d
|
Fix and use null as authMethod None instead of empty string
|
2022-06-14 10:49:30 +08:00 |
|
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
|
2022-06-14 10:36:29 +08:00 |
|
Louis Lam
|
817f6db4fd
|
Remove SQL Server code (which in another pr already)
|
2022-06-14 10:32:38 +08:00 |
|
Louis Lam
|
6e43ef1dd3
|
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
|
2022-06-13 20:56:14 +08:00 |
|
Louis Lam
|
f4f2b8ddb8
|
Try to fix #1658
|
2022-06-13 19:24:05 +08:00 |
|
Louis Lam
|
d4485fe62f
|
Make the monitor type list a bit clear
|
2022-06-13 18:14:47 +08:00 |
|
Louis Lam
|
04e22f17a9
|
Merge remote-tracking branch 'origin/master' into christopherpickering_master
# Conflicts:
# package-lock.json
# src/languages/en.js
|
2022-06-11 20:59:58 +08:00 |
|
Louis Lam
|
6ee7b3696a
|
Merge pull request #1633 from domingospanta/bugfix/1451_blank_page_on_unkown_resource
Bugfix/1451 blank page on unkown resource
|
2022-06-06 21:54:49 +08:00 |
|
Matthew Nickson
|
0e28707307
|
Minor formatting for JSDoc comments
Added a number of minor formatting changes to JSDoc comments in /src
|
2022-06-02 15:15:21 +01:00 |
|
Matthew Nickson
|
b0476cfb5b
|
Added JSDoc for src/pages/*
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
|
2022-06-02 13:46:44 +01:00 |
|
Louis Lam
|
091158cfe7
|
[Status Page] Preload data
|
2022-06-01 13:05:12 +08:00 |
|
Nelson Chan
|
26ff6f45a0
|
Feat: Use i18n pluralization
|
2022-05-30 17:53:32 +08:00 |
|
Louis Lam
|
c095767f4a
|
[Status Page] SSR
|
2022-05-30 15:45:44 +08:00 |
|
Moritz R
|
e9e78c26e5
|
Merge branch 'master' into master
|
2022-05-27 13:59:58 +02:00 |
|
Louis Lam
|
35b8e89457
|
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
Added #1059: Allow to specify Resolver Port for DNS Monitor
|
2022-05-25 14:59:14 +08:00 |
|
Domingos F. Panta Jr
|
73b965c867
|
Merge branch 'master' into bugfix/1451_blank_page_on_unkown_resource
|
2022-05-19 19:35:58 +01:00 |
|
c0derMo
|
32cfd411f8
|
Fixed style & code errors
|
2022-05-19 12:35:55 +00:00 |
|
Moritz R
|
a9f3142cee
|
Merge branch 'master' into master
|
2022-05-19 14:24:02 +02:00 |
|
Nelson Chan
|
b7ba6330db
|
Feat: Add cert exp. settings
|
2022-05-19 16:49:34 +08:00 |
|
Sascha Kruse
|
019d638767
|
Merge remote-tracking branch 'ghupstream/master' into radius-check
|
2022-05-18 15:54:10 +02:00 |
|