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
b651f4b5b6
Merge branch 'origin/develop' into Weblate.
2021-10-13 10:10:02 +00:00
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
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
c405880a39
Add labs docs for polls feature
...
See https://github.com/matrix-org/matrix-react-sdk/pull/6934
2021-10-12 15:15:17 -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
75faabacd4
Merge branch 'origin/develop' into Weblate.
2021-10-12 16:51:59 +00:00
0d5127d85e
Merge branch 'origin/develop' into Weblate.
2021-10-12 16:51:57 +00:00
e946df5e2b
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 92.7% (2975 of 3208 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2021-10-12 16:51:57 +00: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
4ce0d0a5ae
Merge branch 'origin/develop' into Weblate.
2021-10-12 13:03:19 +00:00
89958e6b10
Translated using Weblate (Spanish)
...
Currently translated at 100.0% (3208 of 3208 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-10-12 13:03:19 +00: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
347f90ef73
Merge branch 'origin/develop' into Weblate.
2021-10-12 11:18:31 +00:00
7ed733d9bf
Merge pull request #19357 from vector-im/gsouquet/fix-wrench-tests
2021-10-12 12:18:27 +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
1490d4f462
Revert Jest 27 upgrade
2021-10-12 10:59:56 +01:00
774cc25183
Merge branch 'origin/develop' into Weblate.
2021-10-12 09:32:47 +00: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
c68dcab7c6
Merge branch 'master' into develop
2021-10-12 09:15:46 +01:00
f53e12624e
v1.9.2
2021-10-12 09:15:26 +01:00
5cefdb028d
Prepare changelog for v1.9.2
2021-10-12 09:15:25 +01:00
45ee6982c2
Merge branch 'origin/develop' into Weblate.
2021-10-12 08:13:12 +00:00
193a060ec9
Reset matrix-js-sdk back to develop branch
2021-10-12 09:13:06 +01:00
93c037a318
Merge branch 'origin/develop' into Weblate.
2021-10-12 08:11:12 +00:00
46e526c038
Reset matrix-react-sdk back to develop branch
2021-10-12 09:10:54 +01:00
613c04d984
Reset matrix-js-sdk back to develop branch
2021-10-12 09:10:42 +01:00
403c851461
Merge branch 'release-v1.9.2'
2021-10-12 09:07:34 +01:00
1cf095a3e1
v1.9.2
2021-10-12 08:59:57 +01:00
2deee7a709
Prepare changelog for v1.9.2
2021-10-12 08:59:56 +01:00
50a2badd96
Upgrade matrix-react-sdk to 3.32.1
2021-10-12 08:57:57 +01:00
df3647f139
Upgrade matrix-js-sdk to 14.0.1
2021-10-12 08:57:01 +01:00
80e515afbd
Merge branch 'origin/develop' into Weblate.
2021-10-12 07:55:12 +00: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
71e430c41e
Merge branch 'origin/develop' into Weblate.
2021-10-12 07:08:05 +00:00
Travis Ralston