Michael Telatynski
7e14601858
Merge pull request #6889 from jaiwanth-v/colour-variable-export
2021-09-30 16:34:11 +01:00
Jaiwanth
1e90043eb3
Change colour variable for export dialog subheading
2021-09-30 20:58:03 +05:30
Michael Telatynski
5eaf0e7e25
Merge pull request #6081 from jaiwanth-v/export-conversations
2021-09-30 12:49:24 +01:00
Jaiwanth
e0267258a4
Initialize css string
2021-09-30 16:24:31 +05:30
Jaiwanth
d264f5f98e
Change js-sdk import style
2021-09-29 20:55:09 +05:30
Michael Telatynski
c23e698d22
Merge pull request #6885 from matrix-org/t3chguy/fix/19030
2021-09-29 16:06:22 +01:00
Michael Telatynski
fbf74bea1b
Merge pull request #6886 from matrix-org/t3chguy/fix/19223
2021-09-29 16:06:14 +01:00
Michael Telatynski
7e47211d4f
Merge pull request #6878 from matrix-org/t3chguy/fix/19192
2021-09-29 15:10:54 +01:00
Jaiwanth
6ccb7e9145
Space after brand
2021-09-29 19:37:31 +05:30
Michael Telatynski
c0b6c001ca
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19192
2021-09-29 15:04:14 +01:00
Jaiwanth
208b914cb0
Merge branch 'develop' into export-conversations
2021-09-29 19:32:05 +05:30
Michael Telatynski
56745f29c0
Fix spaces null-guard breaking the dispatcher settings watching
2021-09-29 15:01:58 +01:00
Michael Telatynski
ad5842c87a
Allow closing Dropdown via its chevron
2021-09-29 14:24:12 +01:00
Michael Telatynski
f7fba91387
Merge pull request #6883 from matrix-org/t3chguy/fix/19067
2021-09-29 14:19:55 +01:00
Michael Telatynski
0056b282a6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19067
2021-09-29 14:13:04 +01:00
Michael Telatynski
f75af2da54
Merge pull request #6881 from matrix-org/t3chguy/fix/18975
2021-09-29 14:06:26 +01:00
Michael Telatynski
d7aaeb37b9
delint
2021-09-29 14:05:31 +01:00
Germain
c3bac33b9d
Merge pull request #6880 from matrix-org/rav/fix_autoscroll
2021-09-29 12:29:17 +01:00
Michael Telatynski
21e93febb6
i18n
2021-09-29 11:54:03 +01:00
Michael Telatynski
0e79daee4b
Remove stale new in the spaces beta toast & modal
2021-09-29 11:53:13 +01:00
Michael Telatynski
a811df4786
Merge pull request #6882 from andybalaam/remove-extra-word
2021-09-29 11:53:09 +01:00
Michael Telatynski
af8c07a69b
Ensure that sub-spaces aren't considered for notification badges
2021-09-29 11:45:27 +01:00
Andy Balaam
842ab0af05
Remove extra 'are' in README
...
Signed-off-by: Andy Balaam <andyb@element.io>
2021-09-29 11:41:37 +01:00
Richard van der Hoff
c99216814f
fix lint
2021-09-29 11:20:51 +01:00
Richard van der Hoff
b285315cb8
Fix ScrollPanel.isAtBottom for non-standard DPI settings
2021-09-29 11:16:41 +01:00
Michael Telatynski
399ceaf002
Merge pull request #6879 from matrix-org/t3chguy/fix/19164
2021-09-29 10:05:43 +01:00
Michael Telatynski
02c5b7e28d
Pluck out some more applicable styles
2021-09-28 16:36:25 +01:00
Michael Telatynski
4335cd03c5
Pluck out JoinRuleSettings styles so they apply in space settings too
2021-09-28 16:30:17 +01:00
Michael Telatynski
d7c43c7cf8
Fix space children without specific order being sorted after those with one
2021-09-28 15:42:51 +01:00
Germain
ca3b8e596a
Merge pull request #6873 from matrix-org/gsouquet/threads-action-bar-19127
2021-09-28 15:07:36 +01:00
Dariusz Niemczyk
8331d4c7b7
Happily handle empty text messages ( #6825 )
...
This commig refactors the message-deletion modal and reuses it for case of removing
the entire message and trying to send it, which should trigger removal flow instead.
Fix vector-im/element-web#18873
2021-09-28 15:04:25 +01:00
Germain Souquet
c1165830ed
Create rendering context enum for MessageActionBar
2021-09-28 14:55:00 +01:00
Michael Telatynski
e95e59e2eb
Merge pull request #6875 from matrix-org/t3chguy/fix/19093
2021-09-28 13:55:56 +01:00
Michael Telatynski
540593e75d
Merge pull request #6874 from matrix-org/t3chguy/spaces-null-guard-client
2021-09-28 13:55:39 +01:00
Germain Souquet
160bf8e21f
Fix missing prop
2021-09-28 11:06:06 +01:00
Michael Telatynski
ba8ec1763b
Fix space panel width mismatch for creation modal shade
2021-09-28 11:05:03 +01:00
Michael Telatynski
d71f2345fb
Null guard around the matrixClient in SpaceStore
2021-09-28 10:34:32 +01:00
Germain Souquet
e52a33e93c
Merge branch 'develop' into gsouquet/threads-action-bar-19127
2021-09-28 09:34:43 +01:00
Travis Ralston
8e497f8c56
Merge pull request #6871 from psrpinto/fix/close-url-preview-button
...
Fix issue with preview panel close button not appearing for certain messages containing a URL
2021-09-27 13:42:11 -06:00
Paulo Pinto
432dd994bd
Filter out invalid previews
...
The call to cli.getUrlPreview() might return an empty object ({}), which means
there is in fact no preview for that URL.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-09-27 18:07:54 +01:00
Paulo Pinto
dabc13c98f
Extract logic to a function
...
For better readability of the call to useAsyncMemo()
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-09-27 18:07:54 +01:00
Travis Ralston
77ad0a9142
Merge pull request #6699 from SimonBrandner/fix/improve-aux-panel/18787
...
Improve AUX panel behaviour
2021-09-27 10:16:05 -06:00
Germain
8c9cd0d2f4
Merge pull request #6865 from robintown/cut-off-pills
2021-09-27 16:39:04 +01:00
RiotRobot
b635d01779
Reset matrix-js-sdk back to develop branch
2021-09-27 14:33:56 +01:00
RiotRobot
3e2e3fcd20
Resetting package fields for development
2021-09-27 14:33:46 +01:00
RiotRobot
8471445b1e
Merge branch 'master' into develop
2021-09-27 14:33:45 +01:00
RiotRobot
dad60804ba
v3.31.0
2021-09-27 14:31:26 +01:00
RiotRobot
d5dddadc3b
Prepare changelog for v3.31.0
2021-09-27 14:31:25 +01:00
RiotRobot
ccfc57657a
Upgrade matrix-js-sdk to 13.0.0
2021-09-27 14:27:26 +01:00
Michael Telatynski
b461569008
Merge pull request #6824 from matrix-org/t3chguy/fix/spaces-admin-check
2021-09-27 13:56:08 +01:00
