Commit graph

798 commits

Author SHA1 Message Date
Andreas Brett abdf1ae90a
Update en.js 2021-10-23 01:53:31 +02:00
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
Louis Lam 8a481a1be0
Merge pull request #769 from andreasbrett/patch-5
show beat.msg only if available
2021-10-22 18:14:52 +08:00
Andreas Brett 657987a013 fix: show beat.msg only if available 2021-10-22 11:59:53 +02:00
Louis Lam d74577608b
Merge pull request #766 from DX37/translation-ru
Update notifications area in ru-RU.js
2021-10-22 14:10:15 +08:00
Phuong Nguyen Minh 060dde9827
Merge branch 'louislam:master' into master 2021-10-22 08:08:22 +07:00
DX37 1d1601cf24
Update notifications area in ru-RU.js 2021-10-21 22:49:17 +07:00
DX37 29e4e41215
Update ru-RU.js 2021-10-20 23:00:29 +07:00
MrEddX 6463d4b209
Fix: Integration Link Text
Maybe left there from the Slack template.
2021-10-20 09:09:08 +03:00
MrEddX d0b0c64b81
Update bg-BG.js
- Fixed existing fields
- Added new fields
- Translated new fields
2021-10-19 23:03:46 +03:00
Daniel Patrón Gómez 5a05d135b8
Add steam translation in spanish 2021-10-19 17:11:32 +02:00
Louis Lam e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
Text update
2021-10-19 16:34:00 +08:00
Andreas Brett 7def9dcec7
Merge branch 'louislam:master' into patch-1 2021-10-19 00:37:15 +02:00
NeuralMiner a35569481d Updates 2021-10-18 15:26:38 -06: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
Lukas f74b2662c5 Fixed values for sms type 2021-10-18 12:02:54 +02:00
Louis Lam 300a95d779 recompile util.js with tsconfig.json 2021-10-18 17:51:40 +08:00
Louis Lam 16b44001e7 Merge remote-tracking branch 'andreasbrett/patch-1' into andreasbrett_patch-1
# Conflicts:
#	src/util.js
2021-10-18 17:35:17 +08:00
Louis Lam f2f8f33b86 Merge branch 'master' into andreasbrett_patch-1
# Conflicts:
#	src/util.js
2021-10-18 17:30:21 +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
Andreas Brett df4682d19b
Merge branch 'master' into patch-1 2021-10-18 01:14:58 +02:00
Andreas Brett 11a1f35cc5 independent csprng solution 2021-10-18 01:06:20 +02: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
Daniel Patrón Gómez 0a73b84ae6 Add records translations and fix pause translation 2021-10-16 12:45:41 +02:00
Daniel Patrón Gómez 15f36f96c3 Add spanish translation for monitor history 2021-10-16 12:15:39 +02: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 d94fbede32 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:39:32 +07:00
januridp 76e619c066 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:36:07 +07:00
januridp 4e4f94ab98 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:29:51 +07:00
januridp ed3a558397 Fix(Language): Bahasa Indonesia (Indonesian) 2021-10-16 07:15:01 +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
Phuong Nguyen Minh bda481c61e
Update vi.js 2021-10-15 08:26:33 +07:00
iooner 8242a1586d
Update fr-FR.js 2021-10-14 22:23:01 +02: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 37105d720b
Merge pull request #706 from firattemel/master
Update tr-TR.js
2021-10-14 22:40:45 +08:00
Louis Lam 3b74b727f2 [Push Type] fix missing important flag and missing up notification 2021-10-14 22:32:15 +08:00
firattemel 2f0119bc3f Update tr-TR.js 2021-10-14 17:29:13 +03:00
Louis Lam 60acb91fc8
Merge pull request #687 from xjoker/master
Add new notification `Aliyun Sms` and `DingDing`
2021-10-14 17:02:23 +08:00