Commit graph

1999 commits

Author SHA1 Message Date
Louis Lam 39ad8b4bb7 Merge branch 'master' into free-disk-space 2021-10-26 21:18:22 +08:00
Andreas Brett 8fb8cbdaf3 use auth0/jwt-decode 2021-10-26 13:15:31 +02:00
Andreas Brett 3f3d8b4eb3 fixes 2021-10-26 12:58:04 +02:00
Louis Lam 9123e9461f
Update CONTRIBUTING.md 2021-10-26 16:38:00 +08:00
Louis Lam 77addfebc8 Merge branch 'tarun7singh_master'
# Conflicts:
#	src/languages/vi.js
2021-10-26 16:26:59 +08:00
Louis Lam 16846c7c6d
Merge pull request #790 from Saibamen/pl_update+fixes
PL update + fixes
2021-10-26 16:25:04 +08:00
Louis Lam d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification
Support for Bark (APN) notifications
2021-10-26 16:23:11 +08:00
Louis Lam 7cd4bfc11d
Merge pull request #806 from Saibamen/patch-1
Update PULL_REQUEST_TEMPLATE.md
2021-10-26 15:58:14 +08:00
Adam Stachowicz 1d5c0502ab
Add other 2021-10-26 09:48:17 +02:00
Adam Stachowicz a1cda93ad5
Update PULL_REQUEST_TEMPLATE.md
See https://github.com/louislam/uptime-kuma/pull/785#issuecomment-950521657
2021-10-26 09:46:12 +02:00
Louis Lam 3bd420f0e0
Merge pull request #752 from chakflying/feat/chart-period
Feat: Add options for Chart period
2021-10-26 12:53:42 +08:00
Louis Lam 78424b4f2d add simple loading chart effect 2021-10-26 12:48:21 +08:00
Louis Lam f8055ed03d minor css 2021-10-26 12:33:46 +08:00
Louis Lam fe4724fc53 Merge branch 'master' into feat/chart-period 2021-10-26 12:25:07 +08:00
Louis Lam 7f0dda6a44
Update CONTRIBUTING.md 2021-10-26 11:28:38 +08:00
Lakr Aream 43791ee97e Merge branch 'master' into dev-lakr233-bark_notification 2021-10-26 09:08:11 +08:00
Tarun Singh 6362ef6a9c removed other langauge translation data 2021-10-25 18:30:40 -04:00
Adam Stachowicz 9d3a4e9d1e Remove dot from needPushEvery 2021-10-26 00:00:54 +02:00
Tarun Singh 6c60096f56
Merge branch 'louislam:master' into master 2021-10-25 04:12:39 -04:00
Tarun Singh ba1e025353 added click send to number 2021-10-25 04:11:57 -04:00
Louis Lam a41a081727 Merge remote-tracking branch 'origin/master' 2021-10-25 12:29:53 +08:00
Louis Lam a5f15f2319 Fix #793, check dist-backup existing before delete 2021-10-25 12:29:40 +08:00
Louis Lam e69799f613
Update CONTRIBUTING.md 2021-10-25 12:07:44 +08:00
Louis Lam 3c795bebe3
Update CONTRIBUTING.md 2021-10-25 12:06:49 +08:00
Louis Lam 3a43fec666
add recommend pull request guideline 2021-10-25 12:06:01 +08:00
Louis Lam 24c645e437 [empty commit] pull request for free-disk-space 2021-10-25 10:59:13 +08:00
Louis Lam 9d31da1fe8
Merge pull request #792 from gaby/stalebot-fix
Rename stale-bot to stale-bot.yml
2021-10-25 10:26:15 +08:00
Juan Calderon-Perez 2e4c42941a
Rename stale-bot to stale-bot.yml 2021-10-24 21:31:10 -04:00
Andreas Brett 4fc2603818 Merge branch 'patch-6' of https://github.com/andreasbrett/uptime-kuma into patch-6 2021-10-25 01:34:06 +02:00
Andreas Brett 7bc38d4231 remove unused vars 2021-10-25 01:33:45 +02:00
Andreas Brett daad63d70b
Merge branch 'master' into patch-6 2021-10-25 01:24:31 +02:00
Andreas Brett 9ddd2c7365 use jwt 2021-10-25 01:23:02 +02:00
Adam Stachowicz fa5ba12e14 Missing this 2021-10-24 22:15:02 +02:00
Adam Stachowicz 85053f865e Fix typo 2021-10-24 21:56:37 +02:00
Adam Stachowicz 1239f6d1a2 PL update + fixes 2021-10-24 21:50:02 +02:00
Tarun Singh fed611d1b9 Merge branch 'master' of https://github.com/louislam/uptime-kuma 2021-10-24 15:19:25 -04:00
Tarun Singh bc68088350 Click send sms integration for notifications 2021-10-24 15:17:29 -04:00
Louis Lam 90200958cd
Merge pull request #780 from kry008/patch-4
Update pl.js
2021-10-25 00:35:31 +08:00
Louis Lam aa13d74d7a
Merge pull request #788 from Ponkhy/german-language
Updated german language file
2021-10-25 00:32:40 +08:00
Ponkhy d82f305f6e Updated german language file 2021-10-24 17:56:05 +02:00
Louis Lam 7c63cbfd84 add node.js 17 to auto test 2021-10-24 22:50:33 +08:00
Juan Calderon-Perez c7e1267779 More syntax changes. Change What to Which 2021-10-24 10:12:17 -04:00
Louis Lam 5d0b54c292
Merge pull request #785 from Saibamen/patch-1
Create PULL_REQUEST_TEMPLATE.md
2021-10-24 22:07:46 +08:00
Juan Calderon-Perez b50b390048 Changes based on PR requests 2021-10-24 10:04:56 -04:00
Adam Stachowicz 65158cb06b
Update PULL_REQUEST_TEMPLATE.md
Changes after Code Review
2021-10-24 12:21:59 +02:00
Adam Stachowicz 8fe5e4e605
Fix lint 2021-10-24 11:19:42 +02:00
Adam Stachowicz ab5ddae2ee
Delete double new line 2021-10-24 11:18:07 +02:00
Adam Stachowicz 89c64f4ea2
Create PULL_REQUEST_TEMPLATE.md
From https://github.com/Harsha200105/DesktopAssistant/pull/51
2021-10-24 11:16:29 +02:00
Juan Calderon-Perez 40a1ebecc5
Update feature_request.yaml 2021-10-24 00:51:47 -04:00
Juan Calderon-Perez e1793596fe
Merge pull request #1 from gaby/issue-forms 2021-10-24 00:49:18 -04:00