5b55ca03ee
Merge branch 'origin/develop' into Weblate.
2020-09-02 16:45:39 +00:00
b72f0f4d92
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 96.0% (2254 of 2348 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/pt_BR/
2020-09-02 16:45:39 +00:00
e3f971a3d0
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2348 of 2348 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
2020-09-02 16:45:39 +00:00
8484422c55
Merge pull request #5165 from matrix-org/t3chguy/fix/15080
...
Respect user preference for whether pills should have an avatar or not
2020-09-02 17:45:34 +01:00
6d62d85ad2
Merge branch 'develop' into travis/communities/proto/userinfo
2020-09-02 10:33:52 -06:00
451f5f45e7
Merge branch 'origin/develop' into Weblate.
2020-09-02 16:27:02 +00:00
0aafce5ee4
Translated using Weblate (Swedish)
...
Currently translated at 90.1% (2114 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-02 16:27:02 +00:00
9351f949cb
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 95.8% (2248 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/pt_BR/
2020-09-02 16:27:02 +00:00
c849f56458
Merge pull request #5153 from matrix-org/travis/copy2
...
Communities v2 prototype: DM copy updates
2020-09-02 10:26:56 -06:00
beb77799f6
Respect user preference for whether pills should have an avatar or not
2020-09-02 17:26:23 +01:00
9b12355b2a
Appease the linter
2020-09-02 08:59:24 -06:00
05084b57c6
Merge branch 'origin/develop' into Weblate.
2020-09-02 14:07:42 +00:00
156291d151
Translated using Weblate (Swedish)
...
Currently translated at 90.1% (2113 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-02 14:07:42 +00:00
129b9459a3
Merge pull request #5164 from matrix-org/jryans/cross-signing-verif-errors
...
Only wait for public keys during verification
2020-09-02 15:07:34 +01:00
4262a99f67
Tune cross-signing toasts when 4S is missing
...
For the case where cross-signing is trusted on device but secret storage does
not exist, we were showing "verify this device", which is not the best match
from the existing toasts. This tunes the checks to instead show "set up
encryption" which is at least a bit closer.
Part of https://github.com/vector-im/element-web/issues/14970
2020-09-02 14:29:41 +01:00
dd87e9a2f1
During verification, only check user trust status
...
As part of new device verification, we were waiting for "cross-signing ready"
which means _both_ the public keys are trusted by this device _and_ private keys
are available. There's no guarantee that the private keys will ever arrive, so
it's too strict to wait for this as a blocking flow. This relaxes things to wait
only for the current device to trust public keys.
Fixes https://github.com/vector-im/element-web/issues/14970
2020-09-02 14:13:36 +01:00
cffe902504
Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling
2020-09-02 12:00:35 +01:00
6178b3c0e2
Wire up resizeNotifier
2020-09-02 11:13:00 +01:00
243af3c9f2
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
2020-09-02 09:27:06 +01:00
fe7dbac1f8
Merge branch 'develop' of https://github.com/nigelrudolf/matrix-react-sdk into develop
2020-09-01 14:00:07 -04:00
7550a92df9
Fixed 1px jump upwards on filter room members box
...
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-01 13:58:48 -04:00
4f8307605f
Fixed 1px jump upwards on filter room members box
...
Signed-off-by: nigelrudolf <mansell.nigel@mac.com>
2020-09-01 13:41:02 -04:00
92c184385c
Merge branch 'develop' into travis/communities/proto/userinfo
2020-09-01 10:51:42 -06:00
afec470ec3
Merge branch 'develop' into travis/copy2
2020-09-01 10:50:58 -06:00
41e2017fef
Merge branch 'origin/develop' into Weblate.
2020-09-01 16:39:19 +00:00
0d290c9bd2
Reset matrix-js-sdk back to develop branch
2020-09-01 17:39:09 +01:00
36a96c7104
Merge branch 'origin/develop' into Weblate.
2020-09-01 16:38:34 +00:00
52691a1a42
Merge branch 'master' into develop
2020-09-01 17:38:21 +01:00
9df5371dca
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2020-09-01 17:37:52 +01:00
d1d823dcc7
v3.3.0
2020-09-01 17:36:21 +01:00
69e5ed56ae
Prepare changelog for v3.3.0
2020-09-01 17:36:20 +01:00
bb248670a6
Upgrade matrix-js-sdk to 8.2.0
2020-09-01 17:02:49 +01:00
0aceb18736
Merge branch 'origin/develop' into Weblate.
2020-09-01 15:44:31 +00:00
32c0ccf6ea
Translated using Weblate (Swedish)
...
Currently translated at 88.4% (2075 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-01 15:44:31 +00:00
9f2997ba45
Translated using Weblate (German)
...
Currently translated at 100.0% (2346 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-01 15:44:28 +00:00
d7307f9750
Translated using Weblate (German)
...
Currently translated at 100.0% (2346 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-01 15:44:28 +00:00
7c4a84aae0
Merge pull request #5155 from matrix-org/t3chguy/lint-ts
...
Fix eslint ts override tsx matching and delint
2020-09-01 16:44:22 +01:00
d668f8018b
undo some delint
2020-09-01 15:59:19 +01:00
6c39213116
remove unused class TextHighlighter
2020-09-01 15:37:07 +01:00
920730b623
Translated using Weblate (German)
...
Currently translated at 100.0% (2346 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-01 12:57:58 +00:00
bf5370df7c
Translated using Weblate (German)
...
Currently translated at 100.0% (2346 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-01 12:57:58 +00:00
d293444936
Translated using Weblate (German)
...
Currently translated at 99.7% (2340 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-01 12:20:42 +00:00
63b6332025
Translated using Weblate (German)
...
Currently translated at 99.7% (2340 of 2346 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-01 12:20:42 +00:00
790a0bdf33
Merge branch 'origin/develop' into Weblate.
2020-09-01 08:13:46 +00:00
a13cc0ce6a
Merge pull request #5159 from matrix-org/t3chguy/react-err
...
Fix react error about functional components can't take refs
2020-09-01 09:13:42 +01:00
25ce4cae7d
Merge branch 'origin/develop' into Weblate.
2020-09-01 08:13:01 +00:00
fa053e880b
Translated using Weblate (Swedish)
...
Currently translated at 86.3% (2035 of 2358 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-01 08:13:00 +00:00
ba301a26a6
Translated using Weblate (Swedish)
...
Currently translated at 86.3% (2035 of 2358 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-01 08:13:00 +00:00
3288456acf
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2358 of 2358 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-01 08:13:00 +00:00
5e627c34eb
Translated using Weblate (Kabyle)
...
Currently translated at 100.0% (2358 of 2358 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/kab/
2020-09-01 08:12:59 +00:00
Weblate