6bb47ec710
Merge pull request #6945 from matrix-org/t3chguy/fix/19390
2021-10-14 13:40:27 +01:00
069a8d05f1
Space Room View should react to join rule changes down /sync
2021-10-14 12:06:24 +01:00
4d8346f364
Merge pull request #6884 from matrix-org/t3chguy/fix/19010
2021-10-14 11:11:29 +01:00
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
4118d13846
Merge pull request #6829 from matrix-org/t3chguy/fix/18969
2021-10-14 09:59:34 +01:00
a37c10b256
Merge pull request #6920 from matrix-org/t3chguy/fix/17410
2021-10-14 09:58:45 +01:00
53d7c9d2e5
Merge pull request #6921 from matrix-org/t3chguy/fix/19003.1
2021-10-14 09:58:28 +01:00
2a3c483f96
Merge pull request #6919 from matrix-org/t3chguy/fix/19146
2021-10-14 09:58:19 +01:00
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
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
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
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
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
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
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
c2ed27a1b2
Typo
2021-10-13 15:42:57 +01:00
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
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
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
bc336abf47
Fix missing snapshot serializer&enzyme init ( #6932 )
2021-10-13 11:09:43 +01:00
ad53662704
add comma
2021-10-12 15:26:22 -06:00
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
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
8873c75567
Fix bad imports to js-sdk
2021-10-12 13:51:24 -06:00
3417c03f41
Merge pull request #6931 from matrix-org/t3chguy/fix/19350
2021-10-12 17:51:55 +01:00
c141c740d8
Merge pull request #6928 from matrix-org/t3chguy/fix/18883
2021-10-12 17:51:45 +01:00
4416212d0b
Merge pull request #6926 from matrix-org/t3chguy/fix/18231
2021-10-12 14:03:12 +01:00
fd6d853bb1
Allow editing of /rainbow and /rainbowme
2021-10-12 14:02:05 +01:00
ddc408690c
Fix EditorModel clone to actually be useful
2021-10-12 11:02:06 +01:00
fe70e64a40
Improve typing
2021-10-12 11:01:40 +01:00
34b61ad71c
Merge pull request #6872 from AndrewFerr/develop
...
If public room creation fails, retry without publishing it
2021-10-12 10:32:43 +01:00
d050c00703
Fix room list skeleton ui for narrow room list
2021-10-12 10:30:36 +01:00
9f039b5a26
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into AndrewFerr_develop
2021-10-12 10:25:21 +01:00
193a060ec9
Reset matrix-js-sdk back to develop branch
2021-10-12 09:13:06 +01:00
9439df9082
Merge branch 'master' into develop
2021-10-12 08:54:58 +01:00
89365d943b
Resetting package fields for development
2021-10-12 08:48:24 +01:00
3bc1a6613b
Merge branch 'release-v3.32.1'
2021-10-12 08:48:16 +01:00
b1baa3575a
v3.32.1
2021-10-12 08:42:35 +01:00
acce5ea43a
Prepare changelog for v3.32.1
2021-10-12 08:42:34 +01:00
6b4bcbd289
Upgrade matrix-js-sdk to 14.0.1
2021-10-12 08:40:57 +01:00
52efbc4a61
Merge pull request #6930 from robintown/remove-semicolon
2021-10-12 08:06:47 +01:00
c078e89f59
Remove semicolon from notifications panel
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-10-11 14:34:03 -04:00
338497636c
Merge pull request #6925 from matrix-org/t3chguy/fix/18772
2021-10-11 15:02:52 +01:00
c28c62d9f1
Inhibit `Unable to get validated threepid` error during UIA
2021-10-11 14:43:55 +01:00
c4d4229340
hide leave section if you aren't in the room instead of disabling
2021-10-11 13:50:34 +01:00
79a46782d6
Resetting package fields for development
2021-10-11 12:03:50 +01:00
c958d4c1c6
Merge branch 'master' into develop
2021-10-11 12:02:51 +01:00
4ceb2a74cf
v3.32.0
2021-10-11 11:57:04 +01:00
e91d591c90
Prepare changelog for v3.32.0
2021-10-11 11:57:03 +01:00
93cdda8693
Upgrade matrix-js-sdk to 14.0.0
2021-10-11 11:55:21 +01:00
Michael Telatynski