de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
87fedc27b1
Merge branch 'origin/develop' into Weblate.
2021-07-19 15:27:09 +00:00
9d56b56116
Reset matrix-react-sdk back to develop branch
2021-07-19 16:27:02 +01:00
bdb03c4490
Reset matrix-js-sdk back to develop branch
2021-07-19 16:26:51 +01:00
b70eb4aba7
Merge branch 'origin/develop' into Weblate.
2021-07-19 15:26:45 +00:00
cfa47eec00
Merge branch 'master' into develop
2021-07-19 16:26:38 +01:00
d75b0b4ee8
v1.7.33
2021-07-19 16:22:37 +01:00
85e1225a2c
Prepare changelog for v1.7.33
2021-07-19 16:22:36 +01:00
bc07d91810
Upgrade matrix-react-sdk to 3.26.0
2021-07-19 16:19:36 +01:00
183cf150e8
Upgrade matrix-js-sdk to 12.1.0
2021-07-19 16:19:11 +01:00
5ba54ea3da
Merge branch 'origin/develop' into Weblate.
2021-07-19 15:16:43 +00:00
676d2aa187
Resetting package fields for development
2021-07-19 16:16:18 +01:00
13731177a3
Merge branch 'master' into develop
2021-07-19 16:14:58 +01:00
e7ad33db0f
v3.26.0
2021-07-19 16:00:26 +01:00
4d11d5d5ea
Prepare changelog for v3.26.0
2021-07-19 16:00:25 +01:00
3f75e9f224
Merge branch 'origin/develop' into Weblate.
2021-07-19 14:58:45 +00:00
a3e5d76064
Merge pull request #6397 from matrix-org/t3chguy/fix/18040
...
Respect compound emojis in default avatar initial generation
2021-07-19 15:58:40 +01:00
3335ffa069
Upgrade matrix-js-sdk to 12.1.0
2021-07-19 15:54:25 +01:00
5acc7fe8d4
Make errorText properly optional instead of null
2021-07-19 16:49:39 +02:00
13efb396a9
Update eslint-plugin-matrix-org
2021-07-19 15:34:47 +01:00
0c6d3563e1
Merge branch 'origin/develop' into Weblate.
2021-07-19 14:34:24 +00:00
96ddfefc03
Merge pull request #6403 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org
...
Update eslint-plugin-matrix-org
2021-07-19 15:34:21 +01:00
9e9992078b
Update src/@types/global.d.ts
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-19 16:34:07 +02:00
97d490c1b6
Update src/components/views/auth/CaptchaForm.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-19 16:28:30 +02:00
c2394b9161
Fix styling comments
2021-07-19 16:27:39 +02:00
99edfc24e5
Update eslint-plugin-matrix-org
2021-07-19 15:26:40 +01:00
ea1e8bfdd4
Merge branch 'origin/develop' into Weblate.
2021-07-19 14:17:17 +00:00
4d72e05dc6
Translated using Weblate (Galician)
...
Currently translated at 100.0% (3041 of 3041 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-07-19 14:17:16 +00:00
1ea70e5b6e
Merge pull request #6402 from matrix-org/copy-room-link
...
Rename Copy Link to Copy Room Link
2021-07-19 15:14:19 +01:00
f9fbf6f210
Rename Copy Link to Copy Room Link
...
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
2021-07-19 15:05:04 +01:00
9de5ebd4de
Fix grecaptcha throwing useless error sometimes
2021-07-19 15:41:44 +02:00
b0cc7afe85
Merge branch 'origin/develop' into Weblate.
2021-07-19 11:53:47 +00:00
ddaa35cb8b
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (3041 of 3041 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-19 11:53:47 +00:00
c9a26665ef
Translated using Weblate (French)
...
Currently translated at 99.8% (3036 of 3041 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2021-07-19 11:53:45 +00:00
7619e35638
Merge branch 'origin/develop' into Weblate.
2021-07-19 11:53:42 +00:00
7f735a6c6e
Merge pull request #18053 from vector-im/t3chguy/fix/18032
2021-07-19 12:53:37 +01:00
48817499e4
Merge pull request #6399 from matrix-org/t3chguy/fix/18032
...
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
2021-07-19 12:53:34 +01:00
c1ed023e17
Update Twemoji fonts for Unicode Emoji 13.1
2021-07-19 10:45:26 +01:00
8893e3ab2e
Merge branch 'origin/develop' into Weblate.
2021-07-19 09:09:22 +00:00
a754a08d3b
Translated using Weblate (Estonian)
...
Currently translated at 99.6% (3031 of 3041 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-19 09:09:22 +00:00
4a93c7cffc
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (3041 of 3041 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-19 09:09:17 +00:00
4b5ccd87fe
Translated using Weblate (Dutch)
...
Currently translated at 99.9% (3038 of 3041 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-19 09:09:13 +00:00
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox
...
Fix bug where 'other homeserver' would unfocus
2021-07-19 10:09:03 +01:00
331678b913
fix edge case around event permalinks
2021-07-19 09:48:50 +01:00
b23aad28ca
Fix browser history getting stuck looping back to the same room
...
E.g if you click a link to room/#foo:bar?via=baz we'll redirect to room/#foo:bar and now hitting back takes you back to the ?via=baz and means you have to hit back twice without this change
2021-07-19 09:40:08 +01:00
e54a7f0997
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
2021-07-19 09:36:25 +01:00
c0d2dbe7fd
Delint once more
2021-07-19 13:28:09 +05:30
6d0fd0322e
Delint
2021-07-19 13:23:55 +05:30
f07402d234
Fix types and precompute blob sizes to avoid overflows
2021-07-19 13:17:19 +05:30
ed93bf4c77
Reverse events in-place
2021-07-19 13:00:37 +05:30
Michael Telatynski