ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-28 01:04:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
3918 commits 30 branches 115 tags 68 MiB
Commit graph

556 commits

Author SHA1 Message Date
Louis Lam
8d1847c032
Merge pull request #2744 from bobby-ore/add-lunasea-user-id 
Add ability to use User ID for LunaSea notifications
 2023-03-04 17:35:15 +08:00
Louis Lam
71c800b880 Merge remote-tracking branch 'origin/master' into notification-provider-pagertree 
# Conflicts:
#	src/lang/en.json
 2023-03-01 16:17:18 +08:00
Bobby Ore
b21c2adcc2 Rework lunasea notification to allow for device id and user id 2023-02-28 09:47:35 -06: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
7e178d93df
Moved location of disable expiry checkbox 
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-27 18:44:32 +00:00
Matthew Nickson
97e276bdb5
Fixed processing error with add API key 
Also added padding below add button

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-27 18:19:56 +00: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
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
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
98bb854832
Merge pull request #2764 from chakflying/feat/add-new-tag 
Feat: Add "Add New Tag" button in settings
 2023-02-25 02:27:32 +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
af82ea742c Merge manually 2023-02-24 17:21:53 +08:00
Louis Lam
e9475ed3c0 Merge remote-tracking branch 'origin/master' into telegram_test 
# Conflicts:
#	server/notification-providers/telegram.js
#	src/languages/en.js
 2023-02-24 17:08:48 +08:00
Louis Lam
06278dc51f Fix telegram silent issue 2023-02-24 17:03:40 +08:00
Louis Lam
10228874fa Merge manually 2023-02-24 16:54:58 +08:00
Louis Lam
c5034c8f38 Merge remote-tracking branch 'origin/master' into nlutsenko.telegram_silentnotification 
# Conflicts:
#	server/notification-providers/telegram.js
#	src/components/notifications/Telegram.vue
#	src/languages/en.js
 2023-02-24 16:42:57 +08:00
Louis Lam
7e3734af53 Better handling 2023-02-23 20:59:24 +08:00
Louis Lam
5789112f55 Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction 2023-02-23 20:47:28 +08:00
Louis Lam
fa7f75a930 Organize notification list 2023-02-23 18:01:42 +08:00
Louis Lam
7da48b27a5 Fix getUniqueDefaultName 2023-02-22 04:29:43 +08:00
Louis Lam
de7df46aa8 Sort the notification list by name and remove translation keys of brand names or product names 2023-02-22 04:27:12 +08:00
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key 2023-02-14 19:53:33 +00:00
Matthew Nickson
0d6a8b2101
Added more options for confirm modal 
The ability to set the title of the modal has been added, as well as
custom callbacks for the no option.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-14 18:23:51 +00:00
Nelson Chan
33bb9f1ade Feat: Add simple validation on input 2023-02-14 07:16:18 +08:00
Nelson Chan
51dbb23230 Feat: Add "Add New Tag" button in settings 2023-02-13 05:05:30 +08:00
Bobby Ore
48b637d4c8 Refactor to not introduce a breaking change 2023-02-09 08:49:19 -06:00
Bobby Ore
53d9e98e47 Added required to LunaSea notification type select field 2023-02-08 14:13:41 -06:00
Bobby Ore
8725e5daf9 Add ability to use User ID for LunaSea notifications 2023-02-08 14:08:25 -06:00
Austin Miller
1c0174c319 ESLint and verbiage changes 2023-02-06 13:07:56 -07:00
Austin Miller
ef54d9e3b6 Add PagerTree Notification Provider 2023-02-06 11:33:14 -07:00
Haytham Salama
c42e550382 style: formats 2023-02-04 23:46:19 +02:00
Haytham Salama
1bfb290718 feat: add message thread id for telegram nonfiction 2023-02-04 22:53:38 +02:00
Louis Lam
ddce8f0cb0 Fix plugin installation 2023-01-28 19:00:13 +08:00
Louis Lam
50573e6c89
Merge pull request #2635 from Computroniks/bug/2628-uptime-over-100 
Perform sanity check on uptime for status page
 2023-01-27 18:33:37 +08:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support (#1787) 2023-01-27 18:25:57 +08:00
Cyril59310
ae0ef79060
Update french translation (#2634) 2023-01-24 15:16:18 +08:00
Matthew Nickson
e9044ae956
Removed repetitiion of % 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-23 18:10:45 +00:00
Matthew Nickson
86bcb85e9b
Perform sanity check on uptime for status page 
Fixes #2628
A sanity check is performed when calculating the uptime of a monitor on
status page. If it is greater than 100%, we just show 100%. This hasn't
been implemented on the dashboard at the request of @louislam due to
concerns it would make debugging more difficult in future if changes
were made to the uptime calculation.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-18 16:38:55 +00: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
a5ff27da7a Drop the property monitor.maintenance, use lastHeartBeat.status to check status instead 2023-01-17 17:34:47 +08:00
Louis Lam
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544 
Fix: Allow long sms in PromoSMS
 2023-01-16 13:21:56 +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
f7d41a30fa
Update src/components/TagEditDialog.vue 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-13 23:15:41 +08:00
shyneko
27e0b1eea1 Remove required attribute for optional field 2023-01-12 15:52:50 +02:00
Nelson Chan
9c1ba97e7d Chore: Fix typo 2023-01-12 21:25:33 +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
shyneko
521356e38a LINT fixes 2023-01-12 15:21:56 +02:00
shyneko
b91fe9d96d Added a more telegram options 
such as thread id, silent notifications and forward protect
 2023-01-12 15:09:05 +02:00
Łukasz Szczepański
ec30147a7f Add option for allowing long sms in PromoSMS 2023-01-11 14:32:57 +01:00