Michael Telatynski
aa25bad689
tidy
2020-09-16 14:57:46 +01:00
Michael Telatynski
1c44f15d2d
i18n
2020-09-16 14:54:30 +01:00
Michael Telatynski
d3c84e25f5
UI Feature Flag: Identity server
2020-09-16 14:45:34 +01:00
Michael Telatynski
dfabe79335
tidy up event handler
2020-09-16 13:44:24 +01:00
Michael Telatynski
d1070c05dd
UI Feature Flag: Disable VoIP
2020-09-16 13:40:27 +01:00
Michael Telatynski
2bea8457e9
UI Feature Flag: Communities
2020-09-16 12:56:40 +01:00
Michael Telatynski
7a448be1dc
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-16 12:14:33 +01:00
Weblate
74c51c0caa
Merge branch 'origin/develop' into Weblate.
2020-09-16 10:39:00 +00:00
call_xz
c653e7c5a0
Translated using Weblate (Japanese)
...
Currently translated at 56.6% (1344 of 2374 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ja/
2020-09-16 10:39:00 +00:00
Mirza Arnaut
8cbd67d611
Translated using Weblate (Bosnian)
...
Currently translated at 0.2% (4 of 2374 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/bs/
2020-09-16 10:38:59 +00:00
Michael Telatynski
f4f94e31d1
UI Feature Flag: Disable integrations entry UI
2020-09-16 11:38:50 +01:00
Michael Telatynski
45420ff13b
i18n
2020-09-16 11:27:39 +01:00
Michael Telatynski
9cc789756b
UI Feature Flag: Hide flair
2020-09-16 11:26:15 +01:00
Michael Telatynski
04d7aebad0
UI Feature Flag: Disable feedback button
2020-09-16 10:59:14 +01:00
Michael Telatynski
dbd3245e02
i18n
2020-09-16 10:53:30 +01:00
Michael Telatynski
caef9b27a0
Also hide bug reporting prompts from the Error Boundaries
2020-09-16 10:50:53 +01:00
Michael Telatynski
d990986407
Also hide Privacy heading in settings and fix React Key warning
2020-09-16 10:37:15 +01:00
Michael Telatynski
771ab82598
Hide Analytics sections if piwik config is not provided
2020-09-16 10:29:21 +01:00
Weblate
1dc9f6e103
Merge branch 'origin/develop' into Weblate.
2020-09-15 16:43:01 +00:00
Travis Ralston
3d9c520af8
Merge pull request #5201 from matrix-org/travis/3pid-invites
...
Tactical improvements to 3PID invites
2020-09-15 10:42:55 -06:00
Weblate
33af708d64
Merge branch 'origin/develop' into Weblate.
2020-09-15 15:23:53 +00:00
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172
...
If no bug_report_endpoint_url, hide rageshaking from the App
2020-09-15 16:23:48 +01:00
Michael Telatynski
16d8ea184d
i18n
2020-09-15 15:58:23 +01:00
Weblate
dacdacd70d
Merge branch 'origin/develop' into Weblate.
2020-09-15 14:55:15 +00:00
Travis Ralston
60c6e23b94
Match intended case for settings
2020-09-15 08:55:03 -06:00
Weblate
c80c0f31cf
Merge branch 'origin/develop' into Weblate.
2020-09-15 14:53:53 +00:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base
...
Introduce a concept of UI features, using it for URL previews at first
2020-09-15 08:53:48 -06:00
Travis Ralston
246b802206
Merge branch 'develop' into travis/3pid-invites
2020-09-15 08:53:32 -06:00
Weblate
74f953cdd3
Merge branch 'origin/develop' into Weblate.
2020-09-15 14:52:25 +00:00
Travis Ralston
d11ce5fade
Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons
...
Remove defunct "always show encryption icons" setting
2020-09-15 08:52:19 -06:00
Michael Telatynski
6c166f0560
If no bug_report_endpoint_url, hide rageshaking from the App
2020-09-15 15:49:25 +01:00
Weblate
3aeefa98f4
Merge branch 'origin/develop' into Weblate.
2020-09-15 13:09:45 +00:00
LinAGKar
c605c3636b
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (2375 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-15 13:09:45 +00:00
Jeff Huang
0e3c478e38
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2375 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
2020-09-15 13:09:45 +00:00
linsui
d643f908b1
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 97.5% (2316 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hans/
2020-09-15 13:09:44 +00:00
Michael Telatynski
9a3c30b1f1
Merge pull request #5203 from matrix-org/t3chguy/fix/15150
...
Don't show Notifications Prompt Toast if user has master rule enabled
2020-09-15 14:09:38 +01:00
Michael Telatynski
6b5426bddd
Rename toolbar Notifier methods to prompt
2020-09-15 13:58:29 +01:00
Travis Ralston
0cac6874d4
Update i18n
2020-09-14 22:31:45 -06:00
Travis Ralston
f4f30a3274
Introduce a concept of UI features, using it for URL previews at first
...
Fixes https://github.com/vector-im/element-web/issues/15176
This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
2020-09-14 22:28:02 -06:00
Travis Ralston
b177843e45
Remove defunct "always show encryption icons" setting
...
It doesn't do anything in practice.
Fixes https://github.com/vector-im/element-web/issues/8725
2020-09-14 22:03:54 -06:00
Travis Ralston
61e8d3e3d7
Merge branch 'develop' into travis/3pid-invites
2020-09-14 11:50:08 -06:00
Weblate
9bf4891182
Merge branch 'origin/develop' into Weblate.
2020-09-14 16:09:51 +00:00
Michael Telatynski
ab91ce4b2d
Merge pull request #5206 from matrix-org/t3chguy/fix/15170
...
Fix Bridges tab crashing when the room does not have bridges
2020-09-14 17:09:46 +01:00
Michael Telatynski
e32cb175cb
Fix Bridges tab crashing when the room does not have bridges
2020-09-14 15:44:00 +01:00
Weblate
cf3917d638
Merge branch 'origin/develop' into Weblate.
2020-09-14 14:38:16 +00:00
Michael Telatynski
e261a18183
Merge pull request #5202 from matrix-org/t3chguy/fix/15140
...
Don't count widgets which no longer exist towards pinned count
2020-09-14 15:38:10 +01:00
Weblate
3b44958323
Merge branch 'origin/develop' into Weblate.
2020-09-14 14:38:08 +00:00
random
9a3dfe5235
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2375 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
2020-09-14 14:38:08 +00:00
Michael Telatynski
fa50b31fd2
Fix crashes with cannot read isResizing of undefined
2020-09-14 15:20:06 +01:00
Michael Telatynski
229967aa33
Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT
2020-09-14 15:16:29 +01:00
Michael Telatynski
493d3ae288
Don't show Notifications Prompt Toast if user has master rule enabled
2020-09-14 14:35:08 +01:00
Michael Telatynski
73608c4aa9
Don't count widgets which no longer exist towards pinned count
2020-09-14 14:03:51 +01:00
Nikita Epifanov
f6a405ffd7
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2375 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-14 12:44:20 +00:00
Szimszon
475ea4aa2a
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2375 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
2020-09-14 12:44:19 +00:00
Michael Albert
2317300a59
Translated using Weblate (German)
...
Currently translated at 100.0% (2375 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-14 12:44:19 +00:00
Priit Jõerüüt
99811bfc74
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2375 of 2375 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
2020-09-14 12:44:18 +00:00
Weblate
07bcbc0d65
Merge branch 'origin/develop' into Weblate.
2020-09-14 08:45:09 +00:00
discapacidad5
06a8ab20fb
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/es/
2020-09-14 08:45:09 +00:00
Kahina Messaoudi
e5e7c873bc
Translated using Weblate (Kabyle)
...
Currently translated at 99.5% (2360 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/kab/
2020-09-14 08:44:51 +00:00
David Baker
c68a980c59
Merge pull request #5193 from matrix-org/dbkr/remove_jitsi_widget_on_call_button
...
Prompt to remove the jitsi widget when pressing the call button
2020-09-14 09:44:45 +01:00
random
6950159f22
Translated using Weblate (Italian)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
2020-09-13 15:43:01 +00:00
Szimszon
b857b1a239
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
2020-09-13 15:42:59 +00:00
@a2sc:matrix.org
91dc346e5b
Translated using Weblate (German)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-13 15:42:58 +00:00
XoseM
0923eeb2ad
Translated using Weblate (Galician)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
2020-09-13 15:42:58 +00:00
Safa Alfulaij
80f8a18c2a
Translated using Weblate (Arabic)
...
Currently translated at 14.9% (354 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
2020-09-13 15:42:57 +00:00
Travis Ralston
ac300a293e
Add jsdoc
2020-09-11 21:09:42 -06:00
Travis Ralston
fc2173a789
Appease the linter
...
It's almost like I copy/pasted some stuff
2020-09-11 21:05:54 -06:00
Travis Ralston
763309ae80
Show a spinner when processing a registration email confirmation
...
See comment enclosed
2020-09-11 20:58:10 -06:00
Travis Ralston
525ec6b709
Ensure we obliterate 3pid invites on logout
2020-09-11 20:36:26 -06:00
Travis Ralston
803badba1b
Show the user's 3PID invite after they've reloaded the page
...
This is a step towards https://github.com/vector-im/element-web/issues/13430
Since we've stored the invite, we can send the user to it once they reload the page or revisit Element. We currently only support one invite at a time, but this should be fine for most cases.
We only do this restoration if the next screen isn't set to avoid breaking the user out of an expected flow.
As an added touch, this also ensures that the email address is pre-filled on the registration page if needed, just in case the user refreshes before getting to the submit button.
2020-09-11 20:20:33 -06:00
Travis Ralston
a5d7b24805
Add a note for why oob_data isn't threaded yet
...
See https://github.com/vector-im/element-web/issues/15157
2020-09-11 19:57:16 -06:00
Travis Ralston
b1cdf1bc9a
Redirect to the registration page if there's a 3PID invite
...
Fixes https://github.com/vector-im/element-web/issues/15130
2020-09-11 19:53:52 -06:00
Travis Ralston
dc44b9ef59
Store and thread 3pid invite through the app
...
This doesn't do anything with the stored value (yet), but enables us to do something with it in a future commit.
2020-09-11 19:49:48 -06:00
Weblate
8c35392b6e
Merge branch 'origin/develop' into Weblate.
2020-09-11 15:12:51 +00:00
@a2sc:matrix.org
0721ff85fe
Translated using Weblate (German)
...
Currently translated at 99.9% (2372 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 15:12:51 +00:00
Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update
...
Show verification status in the room summary card
2020-09-11 09:12:46 -06:00
Travis Ralston
8862b8298c
Use hooks better
2020-09-11 09:04:06 -06:00
felix adernog
7a26eb9840
Translated using Weblate (German)
...
Currently translated at 99.9% (2372 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 14:44:02 +00:00
toastbroot
d5b8588cb4
Translated using Weblate (German)
...
Currently translated at 99.9% (2372 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 14:39:44 +00:00
@a2sc:matrix.org
4c7d2363ce
Translated using Weblate (German)
...
Currently translated at 99.9% (2372 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 14:39:44 +00:00
LinAGKar
d67ad473c3
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-11 13:52:15 +00:00
Nikita Epifanov
ada8b8deec
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-11 13:52:14 +00:00
Priit Jõerüüt
b1bdb06507
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
2020-09-11 13:52:13 +00:00
Jeff Huang
277aefdd5d
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2373 of 2373 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
2020-09-11 13:52:13 +00:00
David Baker
b633564bea
unused import
2020-09-11 13:02:02 +01:00
David Baker
e54d4e665f
Don't prompt to remove jitsi widget if the user don't have permission
2020-09-11 12:20:32 +01:00
Weblate
ddd12c81a6
Merge branch 'origin/develop' into Weblate.
2020-09-11 09:27:05 +00:00
Nikita Epifanov
19ebc6401f
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2370 of 2370 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-11 09:27:05 +00:00
David Baker
de8865d844
Merge pull request #5191 from matrix-org/dbkr/jitsi_call_naming
...
Call jitsi widgets 'group calls'
2020-09-11 10:27:00 +01:00
David Baker
2af803c1bb
remove unused stuff
2020-09-11 10:17:37 +01:00
David Baker
a93afe8c69
Check jitsi type in proper way
2020-09-11 09:57:13 +01:00
Weblate
b6f91d76b8
Merge branch 'origin/develop' into Weblate.
2020-09-11 08:53:15 +00:00
David Baker
07693b71b1
Merge pull request #5194 from matrix-org/dbkr/dont_unpin_persistent_widgets
...
Don't show 'unpin' for persistent widgets
2020-09-11 09:53:09 +01:00
Weblate
b33f7a698b
Merge branch 'origin/develop' into Weblate.
2020-09-11 08:41:46 +00:00
J. Ryan Stinnett
e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup
...
Split up cross-signing and secure backup settings
2020-09-11 09:41:40 +01:00
Weblate
ddcf1e335e
Merge branch 'origin/develop' into Weblate.
2020-09-11 06:29:16 +00:00
Michael Telatynski
247e1d431d
Merge pull request #5185 from matrix-org/t3chguy/fix/3543
...
Fix onNewScreen to use replace when going from roomId->roomAlias
2020-09-11 07:29:10 +01:00
Travis Ralston
4cb7381d03
Show verification status in the room summary card
...
Fixes https://github.com/vector-im/element-web/issues/15143
Colours are the same for both light and dark theme.
2020-09-10 13:53:42 -06:00
David Baker
b7058a33ad
lint
2020-09-10 14:37:44 +01:00
David Baker
eeb4c5696f
Don't show 'unpin' for persistent widgets
...
This will mostly fix https://github.com/vector-im/element-web/issues/15139
although it could still break in a race condition.
2020-09-10 14:30:35 +01:00
David Baker
18be4cb202
Use widget type fromString
2020-09-10 14:18:49 +01:00
David Baker
96080f2ccc
Prompt to remove the jitsi widget when pressing the call button
...
If there's already one in the room.
We threw up an error message anyway telling you there was already
a jitsi widget, so just add a button to end the call.
2020-09-10 14:06:13 +01:00
Weblate
0c0d014e4f
Merge branch 'origin/develop' into Weblate.
2020-09-10 12:58:19 +00:00
LinAGKar
7d3e0ed9ce
Translated using Weblate (Swedish)
...
Currently translated at 100.0% (2369 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-10 12:58:19 +00:00
yuuki-san
8d4a252184
Translated using Weblate (Slovak)
...
Currently translated at 69.2% (1640 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sk/
2020-09-10 12:58:18 +00:00
Szimszon
9c749626e4
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2369 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
2020-09-10 12:58:18 +00:00
XoseM
c5bf61e270
Translated using Weblate (Galician)
...
Currently translated at 100.0% (2369 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
2020-09-10 12:58:17 +00:00
Jeff Huang
7f1c5537fb
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2369 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
2020-09-10 12:58:16 +00:00
Besnik Bleta
17a6f33b91
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2361 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sq/
2020-09-10 12:58:15 +00:00
Matthew Hodgson
5ecc3f4398
kill formatMinimalBadgeCount entirely
2020-09-10 13:56:46 +01:00
Matthew Hodgson
89d05ac952
bring back 1.2M style badge counts rather than 99+
2020-09-10 13:51:34 +01:00
David Baker
2b965a2741
Call jitsi widgets 'group calls'
...
So they feel a bit more like first class citizens
2020-09-10 11:52:01 +01:00
Weblate
a9ee1e785e
Merge branch 'origin/develop' into Weblate.
2020-09-09 21:08:50 +00:00
Nikita Epifanov
188aee0fcf
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2369 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-09 21:08:50 +00:00
@a2sc:matrix.org
884b54fd02
Translated using Weblate (German)
...
Currently translated at 100.0% (2369 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-09 21:08:49 +00:00
Priit Jõerüüt
9586a981de
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2369 of 2369 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
2020-09-09 21:08:48 +00:00
Travis Ralston
a765db8977
Merge pull request #5189 from matrix-org/travis/rageshake-fix
...
Run the rageshake command through the bug report dialog
2020-09-09 15:08:43 -06:00
Travis Ralston
77f715ba73
Fix i18n and analytics
2020-09-09 14:55:27 -06:00
Travis Ralston
9b5823cccb
Run the rageshake command through the bug report dialog
...
Ideally we encourage users to give us information like a github issue or options to download their logs.
2020-09-09 14:53:38 -06:00
Travis Ralston
0a7090dd64
Account for via in pill matching regex
...
Fixes https://github.com/vector-im/element-web/issues/15133
Regression first appeared in a80bcaa292
This also affects room IDs.
2020-09-09 14:36:35 -06:00
Michael Telatynski
c26f3b8a97
Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place
2020-09-09 16:52:46 +01:00
David Baker
62556c2afe
Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets
...
Always allow widgets when using the local version
2020-09-09 15:52:31 +01:00
David Baker
f9079975a1
write correct jsdoc
2020-09-09 15:42:25 +01:00
David Baker
99b0a0a78e
Always allow widgets when using the local version
...
Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app.
2020-09-09 15:35:05 +01:00
Michael Telatynski
a1f1334250
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3
...
Conflicts:
src/components/structures/RoomView.tsx
2020-09-09 15:16:19 +01:00
Weblate
db5cbdf709
Merge branch 'origin/develop' into Weblate.
2020-09-09 13:34:36 +00:00
J. Ryan Stinnett
0219824d6f
Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup
2020-09-09 14:13:23 +01:00
J. Ryan Stinnett
6d1b1d9460
Fix linting error
2020-09-09 14:12:36 +01:00
Michael Telatynski
04d2f93902
Fix WidgetStore handler bindings
2020-09-09 13:15:19 +01:00
Michael Telatynski
0e58eb6d56
Update initial widget height
2020-09-09 13:15:07 +01:00
Michael Telatynski
8d66dce68d
Update copy and use svg for ellipsis
2020-09-09 12:50:48 +01:00
Michael Telatynski
b635598bc3
Attempt to fix tests and fix RoomSummaryCard having wrong member count
2020-09-09 12:28:12 +01:00
Michael Telatynski
bb98587143
fix e2e tests. Change the default Room Tab to RoomSummary
2020-09-09 11:42:41 +01:00
Michael Telatynski
37c0d524bc
re-order top right buttons
2020-09-09 11:06:15 +01:00
Michael Telatynski
29c2a0ef35
Fix FilePanel and NotificationPanel overscroll issues
2020-09-09 09:50:08 +01:00
Michael Telatynski
517b594edc
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1
...
Conflicts:
src/components/structures/RightPanel.js
2020-09-08 18:04:24 +01:00
J. Ryan Stinnett
bbe2084f66
Add independent set up / reset actions in Settings
...
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
2020-09-08 18:01:56 +01:00
Michael Telatynski
12a6bc8231
update copy
2020-09-08 18:00:21 +01:00
Michael Telatynski
596060c506
fix alignments and iterate PR
2020-09-08 17:57:08 +01:00
Weblate
97199c4479
Merge branch 'origin/develop' into Weblate.
2020-09-08 16:46:07 +00:00
Michael Telatynski
83c2ae2479
Merge pull request #5180 from matrix-org/t3chguy/fix/15123
...
null-guard roomId in RightPanel and pass Room to UserView
2020-09-08 17:46:02 +01:00
Michael Telatynski
01a8ac25c9
Use null coalescing operator
2020-09-08 17:40:57 +01:00
Michael Telatynski
a17b2ba1e5
use constant
2020-09-08 17:38:13 +01:00
Michael Telatynski
27a65fff2b
null-guard roomId in RightPanel and pass Room to UserView
2020-09-08 17:34:32 +01:00
Weblate
e204914e31
Merge branch 'origin/develop' into Weblate.
2020-09-08 16:27:57 +00:00
TERMICO
093ed37c17
Translated using Weblate (Spanish)
...
Currently translated at 88.0% (2073 of 2356 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/es/
2020-09-08 16:27:56 +00:00
Michael Telatynski
8d03799ffe
Fix create-react-class regression.
...
Can't call setState in c'tor
2020-09-08 16:51:55 +01:00
Michael Telatynski
1532048f33
Fix behaviour WidgetStore for new/unknown rooms
2020-09-08 16:49:50 +01:00
Michael Telatynski
b982bf87b5
delint
2020-09-08 16:33:55 +01:00
Michael Telatynski
8d14d26e2b
do the todos
2020-09-08 16:27:09 +01:00