ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-10-31 03:30:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2372 commits 31 branches 115 tags 54 MiB
Commit graph

415 commits

Author SHA1 Message Date
Andreas Brett
606c967985
Merge branch 'master' into patch-6 2021-10-23 01:52:54 +02:00
Andreas Brett
9ad8e5f56a show logged in user 2021-10-22 13:05:52 +02:00
NeuralMiner
572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges 2021-10-18 12:57:28 -06:00
Louis Lam
182597944d fix #721 2021-10-19 00:19:26 +08:00
Louis Lam
20d59e5a13 fix and move the steam api key to settings page 2021-10-18 17:02:05 +08:00
Louis Lam
ae31eb6ba9 Merge branch 'master' into Revyn112_master 
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2021-10-18 15:50:35 +08:00
Louis Lam
6944b35ea7
Merge pull request #667 from zsxeee/i18n 
Missing i18n and zh-CN translation
 2021-10-16 22:47:58 +08:00
Louis Lam
edcaf93446
Merge pull request #721 from dpatrongomez/master 
Add Status Translation
 2021-10-16 17:41:46 +08:00
Daniel Patrón Gómez
53a008ae2b Add Status Translation 2021-10-16 11:32:15 +02:00
Bert Verhelst
61627545a5 fix(edit-monitor): no need to escape placeholder {} if not translated 2021-10-16 11:26:32 +02:00
Louis Lam
cb43ecb46e Merge branch 'master' into background-jobs 
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
 2021-10-16 15:06:59 +08:00
NeuralMiner
8cb26d2b31 Text update 2021-10-15 19:12:09 -06:00
januridp
76e619c066 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:36:07 +07:00
Louis Lam
f4b8da0a5c Merge branch 'feature/add-support-for-method-body-and-headers' 2021-10-15 19:02:49 +08:00
Louis Lam
4178983df3 Merge remote-tracking branch 'origin/master' 2021-10-15 19:01:04 +08:00
Louis Lam
7ac0ab2e34 [http options] beautify the json format when clicked the save button 2021-10-15 18:57:27 +08:00
Louis Lam
cd211a6be7 [http options] fine tune 2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-15 16:07:05 +08:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject 
Add support for custom subject in emails
 2021-10-15 00:54:31 +08:00
Louis Lam
3b74b727f2 [Push Type] fix missing important flag and missing up notification 2021-10-14 22:32:15 +08:00
Louis Lam
8338881927 [SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements 2021-10-14 16:07:25 +08:00
zsxeee
33f773fcd0
Move param out of the translation file 2021-10-13 15:36:07 +08:00
KangAlleW
2939bd4138 fix locale 2021-10-13 03:12:26 +07:00
KangAlleW
4b9f0a3fe6 add indonesian language and edit settings.vue 2021-10-13 02:53:46 +07:00
Nelson Chan
03b07730d3 Fix: Increase default kept period 2021-10-12 23:28:21 +08:00
zsxeee
3fe91c52cb
Fix i18n 
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
 2021-10-12 16:29:18 +08:00
Daniel S. Billing
62805014df Update Settings.vue 2021-10-10 18:38:19 +02:00
Bert Verhelst
8a739af5ad Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-09 21:44:22 +02:00
Nelson Chan
6cf2eb036d Fix: Improve settings layout and wording 2021-10-09 23:51:05 +08:00
Nelson Chan
dca5a59dbc Feat: Implement data clearing logic & frontend 2021-10-09 23:33:47 +08:00
LouisLam
cac0a46bac fix error if tls info object is in old format 2021-10-09 19:08:38 +08:00
Bert Verhelst
d71d27220b fix(edit-monitor): store headers as JSON 2021-10-09 12:42:32 +02:00
Bert Verhelst
b8093e909b fix(edit-monitor): fix minification of translations containing { } 2021-10-09 11:38:12 +02:00
Bert Verhelst
c3c273f9df fix(edit-monitor): fix regex to allow a single header 2021-10-09 11:20:33 +02:00
Bert Verhelst
daab2a05f5 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-09 11:13:16 +02:00
LouisLam
fc8d1e78b6 [push type] hide upside down mode, apply primary base url 2021-10-08 20:03:52 +08:00
Bert Verhelst
ec4b7e4064 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 18:22:59 +02:00
LouisLam
2c19aef4dc minor 2021-10-07 18:06:43 +08:00
LouisLam
e5f6d7f047 slack and rocket.chat use the primary base url 
env var to show time logger
 2021-10-07 17:39:58 +08:00
LouisLam
d08a71ab49 Set primary base url in settings page 2021-10-07 16:30:16 +08:00
LouisLam
ed67803af8 improve minor style 2021-10-07 16:10:21 +08:00
Bert Verhelst
8be4bf0e16 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-07 08:56:29 +02:00
MrEddX
9f5bf37a96
Update Settings.vue 2021-10-07 09:37:13 +03:00
Nelson Chan
a87595a849
Fix: Allow underscore in hostname 2021-10-07 03:29:42 +08:00
Bert Verhelst
550825927c Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-05 18:19:07 +02:00
Louis Lam
865b721b79
Merge pull request #519 from chakflying/improve-certInfo 
Feat: Improve Certificate Info Display
 2021-10-05 16:09:08 +08:00
Bert Verhelst
afeb424dc0 fix(edit-monitor): add translations to en.js 2021-10-05 09:20:24 +02:00
Bert Verhelst
6b44116245 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers 2021-10-05 08:54:40 +02:00
Bert Verhelst
7ee89fab5c
fix(edit-monitor): Make json capitalised 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-04 11:29:43 +02:00
Csábi Béla
980342546e Merge branch 'hu' 2021-10-03 23:38:13 +02:00
Csábi Béla
6b60dc9630 Initial Hungarian translation 2021-10-03 23:15:34 +02:00
Csábi Béla
8d22b43f24 Revert "Initial Hungarian translation" 
This reverts commit dad58341c6.
 2021-10-03 23:11:19 +02:00
Csábi Béla
dad58341c6 Initial Hungarian translation 2021-10-03 23:09:17 +02:00
Bert Verhelst
3f0b85e5a8 feat(http-requests): add support for methods, body and headers for http 2021-10-02 16:48:27 +02:00
Bert Verhelst
c2a560e2ed fix(setup): increase left padding input fields + avoid clipping 2021-10-01 14:57:31 +02:00
Nelson Chan
13bdfefa9d Feat: Improve Certificaet Info Display 2021-10-01 18:56:28 +08:00
LouisLam
7fa1cb83af [push type] add ping parameter 2021-10-01 16:43:11 +08:00
Louis Lam
9d079eeec0
Merge pull request #487 from cmandesign/feature/fa-lang-rtl 
Feature/fa lang rtl
 2021-10-01 16:28:20 +08:00
LouisLam
1ed4ac9494 add Push-based monitoring (#279) 2021-10-01 00:09:43 +08:00
Louis Lam
9e95d568c2
Merge pull request #501 from Saibamen/incident_use_local_timezone 
[status-page] Display created and updated time in local timezone. Fixes #491
 2021-09-30 18:13:55 +08:00
Nelson Chan
ba4a4aaf1c Chore: Move multiselect css to own file 2021-09-30 00:08:37 +08:00
Soroosh
f2c7308c96 Fixed Change Language Direction In Setting Page 2021-09-29 10:44:34 +03:30
MrEddX
0f66e5cfc5 Added Bulgarian Language 2021-09-28 23:21:59 +03:00
Denis Freund
efbadd0737 only allow ip address for hostname when monitor type is steam 2021-09-28 13:38:46 +02:00
Adam Stachowicz
f9d633e02b Display created and updated time in local timezone. Fixes #491 2021-09-28 08:07:42 +02:00
Denis Freund
b67b4d5afd add steam gameserver for monitoring 2021-09-27 11:17:57 +02:00
Soroosh
1448de7b19 Update some translations 2021-09-27 00:32:51 +03:30
Soroosh
47749ca58d Replace some hardcoded with translations 2021-09-26 19:56:43 +03:30
Soroosh
04b7a4a423 Merge Conflict Resolved 
Farsi Lang Updated
Some hardcoded words has been replaced with translations
 2021-09-26 19:56:25 +03:30
Soroosh
f41e95921f Enable localization for pagination 2021-09-26 18:50:12 +03:30
LouisLam
87e213085f add /status, alias of /status-page (#471) 2021-09-25 22:44:29 +08:00
Louis Lam
3d79e841c9
Merge pull request #466 from chakflying/public-dashboard 
[status-page] hide select if no monitors to add
 2021-09-24 18:33:00 +08:00
Nelson Chan
d2af42e579
Fix: Add placeholder if no monitors to add 2021-09-24 16:51:53 +08:00
LouisLam
50b868e751 fix #465 2021-09-24 15:26:48 +08:00
LouisLam
266b03fbf7 language key from "Status Page Nothing" to "statusPageNothing" 2021-09-24 14:42:54 +08:00
Mawoka
69bb6ef290 Removed empty selector if no monitor available 2021-09-24 00:19:09 +08:00
Cosmo Abdon
a4cad3db65 add: BR Portuguese Language and new words 2021-09-23 09:42:33 -03:00
Louis Lam
a9bb8ae6a1
Merge pull request #124 from chakflying/public-dashboard 
Implement Public Dashboard
 2021-09-23 16:54:07 +08:00
LouisLam
27d4c3c194 [status page] improve mobile layout 2021-09-23 16:31:45 +08:00
LouisLam
439f45d91e [status page] improve the entry 2021-09-23 13:57:24 +08:00
Nelson Chan
45a6f364e1 Chore: Fix backslash in IP regex 2021-09-22 23:05:46 +08:00
Nelson Chan
95391be2ab
Revert Regex update 2021-09-22 22:36:27 +08:00
LouisLam
ad1bb93730 [status page] fix logo url 2021-09-22 15:31:15 +08:00
LouisLam
fe0fc63843 [status page] send uptime 2021-09-22 15:10:08 +08:00
Nelson Chan
5b2e1f6086
Fix: Allow number ending TLD 2021-09-22 05:29:56 +08:00
LouisLam
8c7ee94769 add modified apicache library with disabling client cache 2021-09-22 00:58:22 +08:00
LouisLam
0834770509 [status page] also apply the title to <title> 2021-09-21 23:59:46 +08:00
LouisLam
15c00d9158 upload logo and expose ./data/upload to url 2021-09-21 21:22:35 +08:00
Nelson Chan
d2b34f9285
Chore: make eslint happy 2021-09-21 18:53:45 +08:00
Nelson Chan
a96a515087
Fix: Fix hostname with dash 2021-09-21 18:44:32 +08:00
Nelson Chan
2eab919ae0
Fix: Fix typo 2021-09-21 18:41:19 +08:00
Nelson Chan
c09b67b94d
Fix: Fix TCP Ping hostname Regex 2021-09-21 18:27:40 +08:00
LouisLam
a8e170f6a8 Merge branch 'master' into public-dashboard 
# Conflicts:
#	server/server.js
 2021-09-20 18:48:44 +08:00
LouisLam
6aaf984f29 fix retryInterval = 0 if it is an old monitor. (#380 https://github.com/louislam/uptime-kuma/pull/380#issuecomment-922618356) 2021-09-20 18:23:53 +08:00
LouisLam
0b572df3d0 [status page] store config 2021-09-20 16:22:18 +08:00
LouisLam
7ee98d989c [status page] implement rest api for heartbeat 2021-09-19 23:24:51 +08:00
Adam Stachowicz
7dc1e84e44 Avg. Ping and Avg. Response translation keys 2021-09-19 15:15:12 +02:00
LouisLam
fd95d41d9f [status page] many update and save group list 2021-09-19 19:04:51 +08:00
LouisLam
6681f49a58 Merge branch 'master' into public-dashboard 
# Conflicts:
#	.dockerignore
 2021-09-19 15:16:13 +08:00
Louis Lam
803029a9e4
Merge pull request #429 from Ponkhy/main 
Added regex to hostname input
 2021-09-19 00:38:40 +08:00
DX37
9ef45a9c7e
fresh translations to ru-RU.js and Settings.vue 2021-09-18 22:25:06 +07:00
Ponkhy
3a0bc80016 Added regex to hostname input 2021-09-17 16:02:20 +02:00
Louis
a6fdd272a6 [status page] minor 2021-09-17 14:42:19 +08:00
LouisLam
2955abb5d9 [status page] create incident 2021-09-16 22:48:28 +08:00
LouisLam
392f8275b3 Merge branch 'master' into public-dashboard 
# Conflicts:
#	server/database.js
 2021-09-16 16:53:54 +08:00
LouisLam
611d214a32 [status page] checkpoint 2021-09-16 14:37:57 +08:00
Louis Lam
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval 
Added support for a retry interval to monitors
 2021-09-16 00:21:53 +08:00
LouisLam
80322cbfe7 Merge branch 'import-export' 
# Conflicts:
#	src/languages/it-IT.js
#	src/languages/nl-NL.js
 2021-09-16 00:18:07 +08:00
LouisLam
512ff09cca set entry page 2021-09-15 20:40:26 +08:00
LouisLam
e8f4fabcd0 [status page] crop and resize logo 2021-09-15 18:28:48 +08:00
Ponkhy
f679c1cbaf Export button align left 2021-09-15 12:01:30 +02:00
LouisLam
2ab06f87b8 Merge branch 'master' into public-dashboard 2021-09-15 16:46:05 +08:00
LouisLam
db05b506f3 [status page] checkpoint 2021-09-15 14:34:30 +08:00
samet.kum
7274913686 Turkish Language added 2021-09-15 02:55:04 +03:00
No0Vad
1300448bed Adjustments to the retry interval 
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
 2021-09-15 00:59:06 +02:00
LouisLam
afe91078c4 [status page] checkpoint 2021-09-14 23:27:11 +08:00
LouisLam
fc9b4617ca link interval and retryInterval 2021-09-14 15:48:25 +08:00
LouisLam
9902c181bc Merge branch 'master' into public-dashboard 
# Conflicts:
#	src/components/MonitorList.vue
#	src/icon.js
 2021-09-14 15:05:04 +08:00
Louis Lam
069c811af8
Merge pull request #278 from chakflying/tags 
Monitor: Tags with metadata
 2021-09-14 14:57:53 +08:00
LouisLam
f9311e4e7f [status page] 2021-09-14 14:55:45 +08:00
LouisLam
d7a230ac15 Merge branch 'master' into public-dashboard 
# Conflicts:
#	server/server.js
#	src/main.js
 2021-09-14 14:16:24 +08:00
LouisLam
9da2a01a74 [status page] checkpoint 2021-09-14 14:12:27 +08:00
LouisLam
76f1f34a0a fix #397, incorrect encode function for export file 2021-09-13 19:25:12 +08:00
LouisLam
35aca46b68 [status page] checkpoint 2021-09-13 19:21:39 +08:00
Nelson Chan
9b5abf9bb1 Fix: reset editMonitor after save 2021-09-13 14:12:17 +08:00
Nelson Chan
6e3a904aaa WIP: Add tags functionality 
WIP: add color column, show tags

WIP: Improve TagsManager styling & workflow

WIP: Improve styling & validation, use translation

WIP: Complete TagsManager functionality

WIP: Add tags display in monitorList & Details

Fix: update tags list after edit

Fix: slightly improve tags styling

Fix: Improve mobile UI

Fix: Fix tags not showing on create monitor

Fix: bring existingTags inside tagsManager

Fix: remove unused tags prop

Fix: Fix formatting, bump db version
 2021-09-13 14:12:11 +08:00
No0Vad
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval 2021-09-13 00:19:51 +02:00
Ponkhy
4711aeb355
Merge branch 'master' into import-export 2021-09-12 23:21:33 +02:00
Adam Stachowicz
7199bb5ead Remove unused i18n key 2021-09-12 23:11:07 +02:00
Ponkhy
bb87972543 Hide 2FA section if disabled auth 2021-09-12 21:58:52 +02:00
Adam Stachowicz
ea723c7595 Separate import and export. Fix ESLint 2021-09-12 21:35:37 +02:00
LouisLam
e205adfd7b [status page] developing 2021-09-13 02:26:45 +08:00
LouisLam
f47f7758f9 Merge branch 'master' into public-dashboard 
# Conflicts:
#	server/database.js
#	server/server.js
#	server/util-server.js
 2021-09-13 01:09:01 +08:00
LouisLam
7df9698e5d eslint: comma-dangle for language files 2021-09-13 00:58:45 +08:00
Ponkhy
d313966d80
Merge branch 'master' into import-export 2021-09-12 18:46:11 +02:00
Louis Lam
2d7767c905
Merge pull request #392 from bertyhell/bugfix/button-margin-settings 
fix(settings): add some button bottom margin for narrow screens
 2021-09-12 23:49:21 +08:00
Louis Lam
e55193270d
Merge pull request #377 from Lrss/master 
Fix: Inconsistent white-space for the "Avg."-Ping/Response title.
 2021-09-12 23:48:29 +08:00
Louis Lam
9d39071a91
Merge pull request #363 from Ponkhy/2fa 
Added simple TOTP Two Factor Authentication
 2021-09-12 23:47:42 +08:00
Bert Verhelst
660b969178 fix(settings): switch custom styles to bootstrap class for bottom margin 2021-09-12 14:52:47 +02:00
Bert Verhelst
c26622aa39 fix(settings): add some button bottom margin for narrow screens 2021-09-12 13:40:07 +02:00
Ponkhy
7fee4a7ea7 Added import options 2021-09-11 21:53:17 +02:00
No0Vad
f8f9f59464 Added support for a retry interval to monitors 
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
 2021-09-11 18:54:55 +02:00
LouisLam
934685637a [Status Page] WIP: Checkpoint 2021-09-11 23:43:07 +08:00
Ponkhy
8cd5bad44c
Merge branch 'master' into 2fa 2021-09-11 16:32:11 +02:00
Lars Sørensen
66769e1c79
Fixed inconsistent white-space for the "Avg."-Ping/Response title. 2021-09-11 13:52:41 +02:00
LouisLam
3e25f0e9d9 [Status Page] WIP: Checkpoint 2021-09-11 19:40:03 +08:00
Nelson Chan
9e10f7d35f
Fix: Fix events table width on mobile 2021-09-11 18:56:27 +08:00
Adam Stachowicz
c387fb264e Format JSON file before download 2021-09-11 10:50:56 +02:00
LouisLam
4b0a8087a2 do not connect to socket io for status page 2021-09-11 16:22:30 +08:00