Ivan
b1fca7c1a7
Add translation of toast success message
3 years ago
Ivan
19dd11d624
Add translation for incident error message
3 years ago
Ivan
42ce34b6c7
Add more Status page tranlations
3 years ago
Ivan
b7a9d1474f
Fix translation of selected incident style
3 years ago
Ivan
31fa67452e
Delint English language file
3 years ago
Ivan
9ef3727c91
Backed out of commit `be1933614`
...
Running update-language-files will just confuse translators
3 years ago
Ivan Bratović
ed39485af9
Merge with upstream `master`
...
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
3 years ago
Ioma Taani
daef238a70
Updated Italian Language ( #911 )
...
Co-authored-by: Paride Barison <paride.barison@lantechlongwave.it>
3 years ago
Ivan
4cc433166e
Add missing translation for SMTP security option
3 years ago
Ivan
28f530394e
Add missing translation lookup for ClickSendSMS
3 years ago
Ivan
b0615d347b
Add incident creation translations
3 years ago
Ivan
be19336149
Run `update-language-files` for all languages
3 years ago
Ivan
94508cae2f
Add some missing translations
3 years ago
Ivan
265cca9ed1
Replace "Default" notification badge with translation
3 years ago
Ivan
267654c987
Replace hard-coded names for groups in Status page with translations
3 years ago
Ivan
2c85491ee0
Replace body and header placeholder functions with translations
3 years ago
Adam Stachowicz
ba46fb6b1c
Clickable URL
3 years ago
Louis Lam
5df34cd137
Merge pull request #885 from ZegertBoele/patch-1
...
Update to dutch translations
3 years ago
Louis Lam
95bae8289d
Fix setting page when disabled auth
3 years ago
Zegert Boele
dff1056bb1
Update nl-NL.js
...
@deefdragon noticed a flaw, fixed in here
3 years ago
Zegert Boele
62222c0336
Update src/languages/nl-NL.js
...
@koen20 added this correction.
Co-authored-by: Koen Habets <6172623+koen20@users.noreply.github.com>
3 years ago
Ivan Bratović
734762b773
Merge with `master`
...
Signed-off-by: Ivan Bratović <ivanbratovic4@gmail.com>
3 years ago
Ivan Bratović
34d8984e3a
Merge branch 'master' into http-basicauth
3 years ago
Louis Lam
ad82ab0305
Merge pull request #883 from andreasbrett/patch-7
...
24h tooltip on status page
3 years ago
Louis Lam
f952d283c6
Merge pull request #815 from Fallstop/tags-on-status
...
Display Monitor Tags on Status Page
3 years ago
Louis Lam
e164fabf81
Merge pull request #849 from Minvinea/master
...
Adding missing translations
3 years ago
Louis Lam
bc69a331ee
eslint
3 years ago
Jasper Miller-Waugh
e4506963d9
Merge branch 'louislam:master' into tags-on-status
3 years ago
Zegert Boele
222540898b
Some translations were not translated
...
Some translations were not translated yet. I have added them and can be contacted if you want more English-Dutch translations.
3 years ago
Thomas LEVEIL
baf3612ece
🚸 Status page - add group action adds the new group at the top of the page
3 years ago
Andreas Brett
8f44b9f618
24h tooltip on status page
3 years ago
Ivan Bratović
0481a241f3
Add translated placeholders for editing basic auth
3 years ago
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
Ivan Bratović
0dcb7aed21
Delinting
3 years ago
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
3 years ago
Adam Stachowicz
314fa18bdc
Fix #871
3 years ago
MrEddX
ee2c54cfd1
Update bg-BG.js
...
- Added New Fields
- Fixed Existing Fields
3 years ago
Louis Lam
dee131c25d
fix table hover color not working after updated bootstrap to 5.1.3
3 years ago
Jasper Miller-Waugh
e5d6410caf
Apply formatting suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Ivan Bratović
1fb9b25d13
Improve hr-HR translations
3 years ago
Ivan Bratović
9a135deac2
Add new translation for 'Uptime'
3 years ago
Your Name
8e6173c05e
Fix and add new hr-HR translations
3 years ago
Jasper Miller-Waugh
191b81ee07
Fix grammer in comment
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
3 years ago
Jasper Miller-Waugh
12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool.
...
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the tagsVisible setting in the database to fix.
3 years ago
Jasper Miller-Waugh
4004926e64
Small formatting changes from code-review
...
Co-authored-by: deef <deef551@gmail.com>
3 years ago
Adam Stachowicz
4d3d6d6e25
Missing this...
3 years ago
Adam Stachowicz
d06e5ef6fa
More small letters
3 years ago
Adam Stachowicz
b12b848d97
One more typo...
3 years ago
Adam Stachowicz
bb96a577ca
Fix typos + translate `wayToGetTeamsURL`
3 years ago
Adam Stachowicz
8840ca618b
Update `pl.js`
3 years ago
Minvinea
8ec858fd14
Add missing translation
...
Line 282 to 306
3 years ago
Louis Lam
741ed548da
Merge branch 'master' into use_hideCount_option
3 years ago
Louis Lam
bc615c2dd8
Merge pull request #832 from ivanbratovic/croatian-language
...
Clarity and grammar fixes to hr-HR languange file
3 years ago
Louis Lam
1dbf1c3dea
fix logout
3 years ago
Jasper Miller-Waugh
b32bfb3ff1
Added toggle for tag visibility
3 years ago
Jasper Miller-Waugh
24664cde2c
Smarter CSS to fix Mobile alignment
3 years ago
Jasper Miller-Waugh
348c5ec995
Match lint settings
3 years ago
Jasper Miller-Waugh
9143b73f84
Styling for tags
3 years ago
Jasper Miller-Waugh
5e6d945095
Most hacked in POC
3 years ago
Willian Rodrigues Barbosa
036218f711
Add badges to favicon
3 years ago
Adam Stachowicz
69aa60d1fb
Add missing i18n key + translate 2 keys for polish
3 years ago
Ivan Bratović
eaecd6e571
Clarity and grammar fixes to hr_HR languange file
3 years ago
Adam Stachowicz
f2a27a2cf1
Use `hideCount` option for pagination
3 years ago
Louis Lam
5311bef3eb
Merge pull request #809 from Saibamen/pagination_no_text
...
Don't display "count" text for pagination
3 years ago
Louis Lam
c400595f67
Merge pull request #825 from SiderealArt/patch-1
...
Add Traditional Chinese (Taiwan) translation
3 years ago
SiderealArt
67a22399bc
Update i18n.js
3 years ago
SiderealArt
947fc6001e
Update Settings.vue
3 years ago
SiderealArt
c87e67ad1b
Add Traditional Chinese (Taiwan) translation
3 years ago
Ivan Bratović
6f92774a8f
ESLint pass on hr-HR.js file
3 years ago
Ivan Bratović
6e76ab7426
Import hr-HR language in i18n.js
3 years ago
Ivan Bratović
b2fbd7e263
Add confirmDisableAuth tranlation for hr-HR
3 years ago
Ivan Bratović
199e6ec82b
Add initial version of Croatian language
3 years ago
Adam Stachowicz
18a99c2016
Revert deleting `records` and `"One record"` keys
3 years ago
Louis Lam
de5cce9d90
Steam API Key to HiddenInput
3 years ago
Louis Lam
71884cf42a
Merge pull request #772 from andreasbrett/patch-6
...
show logged in user on settings page
3 years ago
MrEddX
cb3da50e7e
Update bg-BG.js
...
Small fixes
3 years ago
Adam Stachowicz
2e7ad1b7b2
Don't display "count" text for pagination
3 years ago
Louis Lam
a9e319517a
add auto vacuum and shrink database button
3 years ago
Andreas Brett
8fb8cbdaf3
use auth0/jwt-decode
3 years ago
Andreas Brett
3f3d8b4eb3
fixes
3 years ago
Louis Lam
77addfebc8
Merge branch 'tarun7singh_master'
...
# Conflicts:
# src/languages/vi.js
3 years ago
Louis Lam
16846c7c6d
Merge pull request #790 from Saibamen/pl_update+fixes
...
PL update + fixes
3 years ago
Louis Lam
d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification
...
Support for Bark (APN) notifications
3 years ago
Louis Lam
78424b4f2d
add simple loading chart effect
3 years ago
Louis Lam
f8055ed03d
minor css
3 years ago
Louis Lam
fe4724fc53
Merge branch 'master' into feat/chart-period
3 years ago
Lakr Aream
43791ee97e
Merge branch 'master' into dev-lakr233-bark_notification
3 years ago
Tarun Singh
6362ef6a9c
removed other langauge translation data
3 years ago
Adam Stachowicz
9d3a4e9d1e
Remove dot from `needPushEvery`
3 years ago
Tarun Singh
ba1e025353
added click send to number
3 years ago
Andreas Brett
4fc2603818
Merge branch 'patch-6' of https://github.com/andreasbrett/uptime-kuma into patch-6
3 years ago
Andreas Brett
7bc38d4231
remove unused vars
3 years ago
Andreas Brett
daad63d70b
Merge branch 'master' into patch-6
3 years ago
Andreas Brett
9ddd2c7365
use jwt
3 years ago
Adam Stachowicz
fa5ba12e14
Missing this
3 years ago
Adam Stachowicz
85053f865e
Fix typo
3 years ago
Adam Stachowicz
1239f6d1a2
PL update + fixes
3 years ago
Tarun Singh
fed611d1b9
Merge branch 'master' of https://github.com/louislam/uptime-kuma
3 years ago
Tarun Singh
bc68088350
Click send sms integration for notifications
3 years ago
Louis Lam
90200958cd
Merge pull request #780 from kry008/patch-4
...
Update pl.js
3 years ago
Ponkhy
d82f305f6e
Updated german language file
3 years ago
Nelson Chan
665bae0806
UI: Simplify dropdown design
3 years ago
Nelson Chan
e4be28a9e7
Fix: Validate beat time before appending
3 years ago
Nelson Chan
445674aacb
Chore: Improve code formatting & comments
3 years ago
Nelson Chan
2f7b60f5e5
Feat: Use separate storage for custom chart period
...
Fix: Fix import error
3 years ago
Nelson Chan
b83c59e308
WIP: Add options for chart period
...
Fix: Fix callback, add toast on error
Fix: Improve styling
Fix: Restore default chart behavior
Fix: Replace 1h with 3h
draft only
3 years ago
Lakr Aream
ce852dfa02
Support for Bark (APN) notifications
...
Update bark.js
3 years ago
Louis Lam
c9549c0de2
change body and header placeholders, less misleading.
3 years ago
kry008
b5eb17ed93
Update pl.js
3 years ago
Andreas Brett
4becb97a5d
Update en.js
3 years ago
Andreas Brett
85e2b36424
Update en.js
3 years ago
Andreas Brett
abdf1ae90a
Update en.js
3 years ago
Andreas Brett
606c967985
Merge branch 'master' into patch-6
3 years ago
Andreas Brett
9ad8e5f56a
show logged in user
3 years ago
Louis Lam
8a481a1be0
Merge pull request #769 from andreasbrett/patch-5
...
show beat.msg only if available
3 years ago
Andreas Brett
657987a013
fix: show beat.msg only if available
3 years ago
Louis Lam
d74577608b
Merge pull request #766 from DX37/translation-ru
...
Update notifications area in ru-RU.js
3 years ago
Phuong Nguyen Minh
060dde9827
Merge branch 'louislam:master' into master
3 years ago
DX37
1d1601cf24
Update notifications area in ru-RU.js
3 years ago
DX37
29e4e41215
Update ru-RU.js
3 years ago
MrEddX
6463d4b209
Fix: Integration Link Text
...
Maybe left there from the Slack template.
3 years ago
MrEddX
d0b0c64b81
Update bg-BG.js
...
- Fixed existing fields
- Added new fields
- Translated new fields
3 years ago
Daniel Patrón Gómez
5a05d135b8
Add steam translation in spanish
3 years ago
Louis Lam
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
...
Text update
3 years ago
Andreas Brett
7def9dcec7
Merge branch 'louislam:master' into patch-1
3 years ago
NeuralMiner
a35569481d
Updates
3 years ago
NeuralMiner
572a5300aa
Recommended updates.
3 years ago
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges
3 years ago
Louis Lam
182597944d
fix #721
3 years ago
Lukas
f74b2662c5
Fixed values for sms type
3 years ago
Louis Lam
300a95d779
recompile util.js with tsconfig.json
3 years ago
Louis Lam
16b44001e7
Merge remote-tracking branch 'andreasbrett/patch-1' into andreasbrett_patch-1
...
# Conflicts:
# src/util.js
3 years ago
Louis Lam
f2f8f33b86
Merge branch 'master' into andreasbrett_patch-1
...
# Conflicts:
# src/util.js
3 years ago
Louis Lam
20d59e5a13
fix and move the steam api key to settings page
3 years ago
Louis Lam
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
3 years ago
Andreas Brett
df4682d19b
Merge branch 'master' into patch-1
3 years ago
Andreas Brett
11a1f35cc5
independent csprng solution
3 years ago
Louis Lam
6944b35ea7
Merge pull request #667 from zsxeee/i18n
...
Missing i18n and zh-CN translation
3 years ago
Daniel Patrón Gómez
0a73b84ae6
Add records translations and fix pause translation
3 years ago
Daniel Patrón Gómez
15f36f96c3
Add spanish translation for monitor history
3 years ago
Louis Lam
edcaf93446
Merge pull request #721 from dpatrongomez/master
...
Add Status Translation
3 years ago
Daniel Patrón Gómez
53a008ae2b
Add Status Translation
3 years ago
Bert Verhelst
61627545a5
fix(edit-monitor): no need to escape placeholder {} if not translated
3 years ago
Louis Lam
cb43ecb46e
Merge branch 'master' into background-jobs
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
3 years ago
NeuralMiner
8cb26d2b31
Text update
3 years ago
januridp
d94fbede32
Fix(Language): Bahasa Indonesia (Indonesian)
3 years ago
januridp
76e619c066
Fix(Language): Bahasa Indonesia (Indonesian)
3 years ago
januridp
4e4f94ab98
Fix(Language): Bahasa Indonesia (Indonesian)
3 years ago
januridp
ed3a558397
Fix(Language): Bahasa Indonesia (Indonesian)
3 years ago
Louis Lam
f4b8da0a5c
Merge branch 'feature/add-support-for-method-body-and-headers'
3 years ago
Louis Lam
4178983df3
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
7ac0ab2e34
[http options] beautify the json format when clicked the save button
3 years ago
Louis Lam
cd211a6be7
[http options] fine tune
3 years ago
Louis Lam
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
Phuong Nguyen Minh
bda481c61e
Update vi.js
3 years ago
iooner
8242a1586d
Update fr-FR.js
3 years ago
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject
...
Add support for custom subject in emails
3 years ago
Louis Lam
37105d720b
Merge pull request #706 from firattemel/master
...
Update tr-TR.js
3 years ago
Louis Lam
3b74b727f2
[Push Type] fix missing important flag and missing up notification
3 years ago
firattemel
2f0119bc3f
Update tr-TR.js
3 years ago
Louis Lam
60acb91fc8
Merge pull request #687 from xjoker/master
...
Add new notification `Aliyun Sms` and `DingDing`
3 years ago
Louis Lam
f51156f18e
run eslint for #687
3 years ago
Louis Lam
8338881927
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
3 years ago
Louis Lam
674b387c95
Merge branch 'master' into smtp-subject
3 years ago
xJoker
8ab4788f80
Update src/components/notifications/index.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
xJoker
4e4ab0577e
Update src/components/notifications/index.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Lukas
89b34b5748
Use double curly brackets and sanity check for customSubject
3 years ago
Andreas Brett
86dcc9bc8f
import webcrypto lib
3 years ago
Louis Lam
79c81395bc
Merge branch 'master' into andreasbrett_patch-1
3 years ago
hrtkpf
84507268ad
fix translations (de-DE and en)
3 years ago
wuwenjing
843992c410
Add DingDing notification
3 years ago
zsxeee
33f773fcd0
Move param out of the translation file
3 years ago
zsxeee
26841a64f0
Update zh-CN.js
3 years ago
Phuong Nguyen Minh
89c0f8b734
Update i18n.js
3 years ago
wuwenjing
57a76e6129
remove `alicloud/pop-core` keep simple
3 years ago
Phuong Nguyen Minh
dc805cff97
Add files via upload
3 years ago
wuwenjing
a2f2253221
Add aliyun sms notification
3 years ago
KangAlleW
2939bd4138
fix locale
3 years ago
KangAlleW
dcf15c3eb7
edit i18n.js
3 years ago
KangAlleW
7c9ed98408
rename id.js to id-ID.js
3 years ago
KangAlleW
4b9f0a3fe6
add indonesian language and edit settings.vue
3 years ago
KangAlleW
5b67fec084
add indonesian language
3 years ago
Nelson Chan
03b07730d3
Fix: Increase default kept period
3 years ago
dhfhfk
05b691d4c9
Fix typo
3 years ago
Kyungyoon Kim
c1112a32df
Update ko-KR.js
3 years ago
Kyungyoon Kim
efc78acfeb
Update ko-KR.js
3 years ago
zsxeee
9e01959d15
Update zh-CN.js
3 years ago
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
3 years ago
Louis Lam
b7528b9a4e
Merge pull request #657 from thomasleveil/patch-2
...
[i18n] minor fixes to french translations
3 years ago
Thomas LÉVEIL
9c058054b9
[i18n] minor update to french translations
3 years ago
Louis Lam
c6683e2a9b
Merge pull request #648 from atlochowski/patch-1
...
Update pl.js
3 years ago
Atlochowski
69ffee55dd
Update pl.js
3 years ago
Atlochowski
ebf0671fef
Update pl.js
3 years ago
wuwenjing
6d9b71c054
Add Feishu notification
3 years ago
Atlochowski
a433de74e6
Update pl.js
...
small fix
3 years ago
Andreas Brett
dc1de50a02
fix for max-inclusive
3 years ago
Andreas Brett
0e6d7694ce
Update util.js
3 years ago
Andreas Brett
503d1f0a91
translation fixes
3 years ago
Andreas Brett
11bcd1e2ed
const
3 years ago
Andreas Brett
06310423f4
typo
3 years ago
Andreas Brett
e127e168b6
typed parameters
3 years ago
Andreas Brett
075535ba46
Update util.ts
3 years ago
Andreas Brett
13cf6891ac
cryptographically strong secret generation
...
generate TOTP secret using WebCrypto API (see https://github.com/louislam/uptime-kuma/issues/640 )
3 years ago
Louis Lam
ad0cde6554
Merge pull request #633 from dhfhfk/master
...
Update ko-KR
3 years ago
Louis Lam
25d18f0da3
Merge pull request #636 from DanielRTRD/add-norwegian-lang
...
Add Norwegian Language
3 years ago
RisedSky
ecc25ba596
Update fr-FR.js
...
Fixed wrong string
Also, "Primary Base URL" is missing from english file
3 years ago
LouisLam
e5286b0973
eslint for ko-KR.js
3 years ago
Daniel S. Billing
037fdd73a3
Norsk
3 years ago
Daniel S. Billing
bb9a936658
Translated some of the notifications services
3 years ago
Bert Verhelst
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
3 years ago
Daniel S. Billing
62805014df
Update Settings.vue
3 years ago
Daniel S. Billing
c79e80442a
Update i18n.js
3 years ago
Daniel S. Billing
f0ff96afd9
Create nb-NO.js
3 years ago
RisedSky
afb75e07d5
Update fr-FR.js
...
Fixed string (Device => Appareil in French)
3 years ago
RisedSky
efd3822930
Update fr-FR.js
...
All the lines corresponds to the English version (sorted correctly)
Plus, updated all the translated strings
3 years ago
dhfhfk
2adac64c83
Update ko-KR.js
3 years ago
LouisLam
272d4bde45
find promossms language key typo
3 years ago
Louis Lam
0c88e4b2f6
Merge pull request #629 from NixNotCastey/pl-update
...
Polish translation update
3 years ago
Louis Lam
5c6230da58
Merge pull request #630 from xinac721/master
...
Update Simplified Chinese Language(更新简体中文语言)
3 years ago
新逸Cary
54f864a1bb
Update Simplified Chinese Language(更新简体中文语言)
3 years ago
Lukas
d6f7be9112
Translated all missing texts and updated few of previously translated.
3 years ago
Lukas
792f3c7c5c
Add support for values of Name, Hostname and Status
3 years ago
Bert Verhelst
8a739af5ad
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
3 years ago
Lukas
edb75808d8
Merge branch 'louislam:master' into smtp-subject
3 years ago
Lukas
5e3ea3293c
Very basic email subject customization
3 years ago
Louis Lam
1f7f20526f
Merge pull request #620 from MrEddX/bulgarian
...
Update bg-BG.js
3 years ago
Robin Schneider
6fe014fa5e
Fixed spelling for german language support
...
Fixed spelling for german language support, hacktoberfest-accepted label woul be appreciated.
3 years ago
Nelson Chan
6cf2eb036d
Fix: Improve settings layout and wording
3 years ago
MrEddX
9d7def93a5
Update bg-BG.js
3 years ago
Nelson Chan
dca5a59dbc
Feat: Implement data clearing logic & frontend
3 years ago
Kyungyoon Kim
2e95e2016d
Translate to Korean
3 years ago
LouisLam
cac0a46bac
fix error if tls info object is in old format
3 years ago
Bert Verhelst
d71d27220b
fix(edit-monitor): store headers as JSON
3 years ago
Bert Verhelst
b8093e909b
fix(edit-monitor): fix minification of translations containing { }
3 years ago
Bert Verhelst
c3c273f9df
fix(edit-monitor): fix regex to allow a single header
3 years ago
Bert Verhelst
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
Daniel Patrón Gómez
d7eac1a413
Update es-ES.js
3 years ago
LouisLam
5ce09953e2
use Segoe UI font for Windows among all languages
3 years ago
LouisLam
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
3 years ago
Louis Lam
efb3f2b19c
Merge pull request #605 from NixNotCastey/promosms
...
Add PromoSMS as notification provider
3 years ago
LouisLam
11abc1f1e0
[test] add test for i18n currentLocale
3 years ago
LouisLam
288e87bb3d
Merge branch 'master' into status-page-default-locale
3 years ago
LouisLam
8ae79ab9bf
improve #560
3 years ago
Lukas
12b5489eb5
PromoSMS as Notification Provider
...
Add PromoSMS (Polish SMS Gateway) as new notification provider
3 years ago
LouisLam
ddad2dcb4a
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/languages/en.js
3 years ago
LouisLam
e96121f69a
fix merging mistake
3 years ago
LouisLam
5b4af550fb
Merge branch 'master' into DeeJayPee_master
3 years ago
LouisLam
0fcb310b97
Merge remote-tracking branch 'Empty2k12/feature/matrix-notifications' into feature/matrix-notifications
...
# Conflicts:
# src/languages/en.js
3 years ago
LouisLam
2ce5c28ed4
Merge branch 'master' into feature/matrix-notifications
...
# Conflicts:
# src/languages/en.js
3 years ago
Bert Verhelst
ec4b7e4064
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago