Commit graph

36395 commits

Author SHA1 Message Date
Germain Souquet
a4cf147d72 Merge branch 'develop' into gsouquet/fix-18264 2021-07-28 10:30:29 +02:00
Michael Telatynski
11e75ee852
Merge pull request #6493 from matrix-org/t3chguy/cp/6492
[Release] Fix CreateRoomDialog exploding when making public room outside of a space
2021-07-28 09:19:57 +01:00
Weblate
161904fb38 Merge branch 'origin/develop' into Weblate. 2021-07-28 08:16:08 +00:00
Germain
77a3d2ec18
Merge pull request #6491 from robintown/align-reactions
Realign reactions row with messages in modern layout
2021-07-28 09:16:04 +01:00
Weblate
358f02f054 Merge branch 'origin/develop' into Weblate. 2021-07-28 08:10:34 +00:00
XoseM
4d8f4c8d15 Translated using Weblate (Galician)
Currently translated at 98.4% (3036 of 3085 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-07-28 08:10:34 +00:00
waclaw66
58f607d99c Translated using Weblate (Czech)
Currently translated at 100.0% (3085 of 3085 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-07-28 08:10:31 +00:00
Jeff Huang
8f48044b65 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3085 of 3085 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-28 08:10:28 +00:00
Szimszon
a34a1f5536 Translated using Weblate (Hungarian)
Currently translated at 99.8% (3080 of 3085 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-07-28 08:10:24 +00:00
libexus
4f0e3d0069 Translated using Weblate (German)
Currently translated at 97.5% (3009 of 3085 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-28 08:10:10 +00:00
Michael Telatynski
98f3a5120c
Merge pull request #6492 from matrix-org/t3chguy/fix/18275.1 2021-07-28 09:10:00 +01:00
Michael Telatynski
f8106ef39b Fix CreateRoomDialog exploding when making public room outside of a space 2021-07-28 08:42:09 +01:00
Michael Telatynski
52e50863f8 Fix CreateRoomDialog exploding when making public room outside of a space 2021-07-28 08:39:59 +01:00
Robin Townsend
3694006d05 Realign reactions row with messages in modern layout
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-27 23:48:51 -04:00
Robin Townsend
d3c69e0d04 Add more types
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-27 17:35:34 -04:00
Robin Townsend
caefefc2c2 Add regional indicators to emoji picker
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-27 17:29:15 -04:00
Michael Telatynski
776435f620 Switch all-rooms toggle for spaces to non-feature settings key 2021-07-27 21:17:24 +01:00
Michael Telatynski
0a9d3302ba Fix home vs all rooms requiring app reload and change default to home
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
Michael Telatynski
ec173e74e6 Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload 2021-07-27 20:15:40 +01:00
Weblate
9582993a6c Merge branch 'origin/develop' into Weblate. 2021-07-27 17:04:27 +00:00
Travis Ralston
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163
Don't set `font-family` explicitly
2021-07-27 11:04:23 -06:00
Šimon Brandner
507dcd91d9
Fix i18n?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:53:57 +02:00
Michael Telatynski
8c073a6439 RoomListStore removeFilter skip triggering update if nothing changed 2021-07-27 17:53:03 +01:00
Šimon Brandner
5f6a1e336e
Remove unnecessary curly braces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:46:19 +02:00
Šimon Brandner
9761c38f3d
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:39:22 +02:00
Weblate
051f5c666e Merge branch 'origin/develop' into Weblate. 2021-07-27 16:20:07 +00:00
Germain
f82744db97
Merge pull request #6487 from matrix-org/gsouquet/fix-18265 2021-07-27 17:20:02 +01:00
Michael Telatynski
12461a79e1 Move SettingsStore setting_updated dispatch to action enum 2021-07-27 17:19:45 +01:00
Germain
7e453d7745
Typo
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-27 17:14:39 +01:00
Šimon Brandner
bc11e215b8
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 18:14:23 +02:00
Weblate
fccc6eff6c Merge branch 'origin/develop' into Weblate. 2021-07-27 16:12:06 +00:00
Michael Telatynski
e7151ebf2d
Merge pull request #6488 from SimonBrandner/fix/call-crash/18270 2021-07-27 17:12:01 +01:00
Šimon Brandner
36607fa8a2
Fix call crashing because element was undefined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:05:50 +02:00
Germain Souquet
30ce7b5eab Make link within replies clickable 2021-07-27 17:57:46 +02:00
Šimon Brandner
6f77d3bbab
Correctly hide the dialpad
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 17:52:13 +02:00
RiotRobot
cc0ff41360 v3.27.0-rc.1 2021-07-27 16:01:52 +01:00
RiotRobot
3003d48914 Prepare changelog for v3.27.0-rc.1 2021-07-27 16:01:51 +01:00
Šimon Brandner
8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
RiotRobot
78eb8ffc26 Upgrade matrix-js-sdk to 12.2.0-rc.1 2021-07-27 15:51:16 +01:00
Šimon Brandner
371de23b00
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 16:40:47 +02:00
Weblate
8ba70573cd Merge branch 'origin/develop' into Weblate. 2021-07-27 14:34:34 +00:00
David Baker
3e7aee3a87
Merge pull request #5992 from SimonBrandner/fix/12652/screen-share
Add support for screen sharing in 1:1 calls
2021-07-27 15:34:27 +01:00
Šimon Brandner
b9e305daae
Delete mistake line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:26:46 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Germain Souquet
3037be11c4 Restore padding for single person state events 2021-07-27 16:24:05 +02:00
Weblate
8e2845adb5 Merge branch 'origin/develop' into Weblate. 2021-07-27 14:05:32 +00:00
Travis Ralston
93f42182c0
Merge pull request #6479 from matrix-org/travis/voice-messages/fix-placeholder-ui
Fix timing of voice message recording UI appearing
2021-07-27 08:05:28 -06:00
Michael Telatynski
62033d0286 Merge branch 't3chguy/fix/18071' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 2021-07-27 15:03:20 +01:00
Michael Telatynski
39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Michael Telatynski
8dd11cd2a5
Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 14:47:18 +01:00