OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
39,525 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

39525 Commits (de28d82b8133acc8cd1cf3c8d5372e2a3c47a7b3)

Author SHA1 Message Date
Michael Telatynski 6bb47ec710
Merge pull request #6945 from matrix-org/t3chguy/fix/19390 2021-10-14 13:40:27 +01:00
Michael Telatynski 069a8d05f1 Space Room View should react to join rule changes down /sync 2021-10-14 12:06:24 +01:00
Weblate 9304934e7c Merge branch 'origin/develop' into Weblate. 2021-10-14 10:11:47 +00:00
Priit Jõerüüt 3f8076b9f7 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3210 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-10-14 10:11:47 +00:00
Besnik Bleta ae29ac4b38 Translated using Weblate (Albanian) 
Currently translated at 99.6% (3199 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-10-14 10:11:44 +00:00
sr093906 63abf9e2c1 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3210 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-10-14 10:11:41 +00:00
Szimszon 124e75b2f0 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3210 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-10-14 10:11:38 +00:00
Michael Telatynski 4d8346f364
Merge pull request #6884 from matrix-org/t3chguy/fix/19010 2021-10-14 11:11:29 +01:00
Michael Telatynski 020eca6922 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19010 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/rooms/MemberList.tsx
	src/components/views/rooms/RoomList.tsx
 2021-10-14 11:05:29 +01:00
Weblate 84124112d7 Merge branch 'origin/develop' into Weblate. 2021-10-14 08:59:39 +00:00
Michael Telatynski 4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969 2021-10-14 09:59:34 +01:00
Weblate 3780ebcb7c Merge branch 'origin/develop' into Weblate. 2021-10-14 08:58:49 +00:00
Michael Telatynski a37c10b256
Merge pull request #6920 from matrix-org/t3chguy/fix/17410 2021-10-14 09:58:45 +01:00
Weblate ec7b844284 Merge branch 'origin/develop' into Weblate. 2021-10-14 08:58:33 +00:00
Michael Telatynski 53d7c9d2e5
Merge pull request #6921 from matrix-org/t3chguy/fix/19003.1 2021-10-14 09:58:28 +01:00
Weblate 889fcdb0c2 Merge branch 'origin/develop' into Weblate. 2021-10-14 08:58:24 +00:00
Michael Telatynski 2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146 2021-10-14 09:58:19 +01:00
Weblate 28ceb62f0d Merge branch 'origin/develop' into Weblate. 2021-10-14 08:31:04 +00:00
Nikita Epifanov f64daf2522 Translated using Weblate (Russian) 
Currently translated at 98.2% (3153 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-10-14 08:31:04 +00:00
Besnik Bleta c6be65d86d Translated using Weblate (Albanian) 
Currently translated at 99.6% (3199 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2021-10-14 08:31:00 +00:00
Priit Jõerüüt cc8d2e3776 Translated using Weblate (Estonian) 
Currently translated at 99.9% (3209 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-10-14 08:30:58 +00:00
Szimszon ffa823e0d4 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3210 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
 2021-10-14 08:30:56 +00:00
Jeff Huang d5c93d772a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3210 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-10-14 08:30:53 +00:00
sr093906 417ba9c2ff Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3210 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-10-14 08:30:51 +00:00
James Salter 1f7d07ab6c
Merge pull request #6942 from SimonBrandner/fix/autoplay-setting 
Don't `setValue()` if that would lead to setting a `null`/`undefined`
 2021-10-14 09:30:43 +01:00
Faye Duxovni eb68e22019 Rerun yarn i18n to put the strings in a different order 2021-10-14 01:03:53 -04:00
Faye Duxovni 8f10a1d3fb Update the button styling on the emoji comparison dialog during cross-signing 
Signed-off-by: Faye Duxovni <fayed@element.io>
 2021-10-14 00:46:15 -04:00
Šimon Brandner 9533f7b0b9
Don't setValue() if that would lead to setting a null/undefined 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-13 19:47:49 +02:00
Weblate c8360235be Merge branch 'origin/develop' into Weblate. 2021-10-13 17:28:58 +00:00
Travis Ralston ea7257698c
Merge pull request #6934 from matrix-org/travis/labs/polls 
Add feature flag for polls and placeholder dialog
 2021-10-13 11:28:53 -06:00
Weblate 3b9019ab3b Merge branch 'origin/develop' into Weblate. 2021-10-13 17:25:57 +00:00
Travis Ralston 3643359c15
Merge pull request #6922 from matrix-org/travis/hide-buttons-customisation 
Add customisation point for visibility of invites and room creation
 2021-10-13 11:25:52 -06:00
Weblate 6088573a71 Merge branch 'origin/develop' into Weblate. 2021-10-13 15:48:16 +00:00
Andy Balaam e40413fa99
Merge pull request #6940 from andybalaam/devicespanel-css-in-devicespanel 
Move the required CSS for DevicesPanel into its own scss file
 2021-10-13 16:48:10 +01:00
Weblate d154831f8a Merge branch 'origin/develop' into Weblate. 2021-10-13 14:50:37 +00:00
David Baker ed9d006615
Merge pull request #6939 from matrix-org/dbkr/fix_room_list_on_unsent_message 
Fix bug where room list would get stuck showing no rooms
 2021-10-13 15:50:31 +01:00
Weblate 7cf6d360bf Merge branch 'origin/develop' into Weblate. 2021-10-13 14:43:07 +00:00
Šimon Brandner 15076ce796
Fix issues with custom themes (#6937) 
Fallback to non-custom colors in custom themes

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-13 16:43:01 +02:00
David Baker c2ed27a1b2 Typo 2021-10-13 15:42:57 +01:00
Weblate d2b502a2b6 Merge branch 'origin/develop' into Weblate. 2021-10-13 13:47:41 +00:00
Travis Ralston a539eada69
Merge pull request #6933 from matrix-org/travis/upstream/fix-imports 
Fix bad imports to js-sdk
 2021-10-13 07:47:36 -06:00
David Baker 0332bc99cb Fix bug where room list would get stuck showing no rooms 
If you had an unsent message in a room that was in a sublist with
the 'Show rooms with unread messages first' option enabled, the
room list would show no rooms next time you restarted element and
get stuck that way.

This was because there was a different notification category for
rooms with unsent messages but the algorithm is hard-coded to add
only a fixed set of categories to its list, and it missed 'unsent',
so it NPEed when it encountered a room with an unsent message.

This just adds the category (assuming that we want to show rooms
with unsent messages first). It doesn't make it less hard-coded, or
fix the fact that an exception in the room list code causes everything
to break.

Fixes https://github.com/vector-im/element-web/issues/19373
 2021-10-13 14:39:09 +01:00
Andy Balaam 4e9a20db21 Move the required CSS for DevicesPanel into its own scss file 
Signed-off-by: Andy Balaam <andyb@element.io>
 2021-10-13 13:55:01 +01:00
Weblate b651f4b5b6 Merge branch 'origin/develop' into Weblate. 2021-10-13 10:10:02 +00:00
Jiri Grönroos 900944a1cf Translated using Weblate (Finnish) 
Currently translated at 89.6% (2877 of 3208 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fi/
 2021-10-13 10:10:02 +00:00
Dariusz Niemczyk bc336abf47
Fix missing snapshot serializer&enzyme init (#6932) 2021-10-13 11:09:43 +01:00
Travis Ralston ad53662704 add comma 2021-10-12 15:26:22 -06:00
Travis Ralston 71c5b02390 Add feature flag for polls and placeholder dialog 
We're anticipating development of polls soon, so for efficiency reasons we're getting the labs flag in early. If something goes wrong with the plan, this whole change will be reverted.
 2021-10-12 15:13:56 -06:00
Travis Ralston d99660d420 Add customisation point for visibility of invites and room creation 
Fixes https://github.com/vector-im/element-web/issues/19331
 2021-10-12 14:33:29 -06:00
Travis Ralston 8873c75567 Fix bad imports to js-sdk 2021-10-12 13:51:24 -06:00