b6feaf74bc
Merge pull request #6407 from robintown/uppercase-avatar-placeholders
2021-07-19 17:56:25 +01:00
b36c748940
Fix avatar placeholders not getting capitalized
...
Regressed by 096d0a7d12
2021-07-19 12:48:44 -04:00
4856559661
Merge pull request #6406 from matrix-org/travis/notifications-ui-order
...
Revert order of notification setting radios
2021-07-19 10:24:06 -06:00
6862d97961
APPEASE THY JSON
2021-07-19 10:18:15 -06:00
b31043b5eb
Revert order of notification setting radios
...
Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
2021-07-19 10:15:42 -06:00
676d2aa187
Resetting package fields for development
2021-07-19 16:16:18 +01:00
13731177a3
Merge branch 'master' into develop
2021-07-19 16:14:58 +01:00
e7ad33db0f
v3.26.0
2021-07-19 16:00:26 +01:00
4d11d5d5ea
Prepare changelog for v3.26.0
2021-07-19 16:00:25 +01:00
a3e5d76064
Merge pull request #6397 from matrix-org/t3chguy/fix/18040
...
Respect compound emojis in default avatar initial generation
2021-07-19 15:58:40 +01:00
3335ffa069
Upgrade matrix-js-sdk to 12.1.0
2021-07-19 15:54:25 +01:00
96ddfefc03
Merge pull request #6403 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org
...
Update eslint-plugin-matrix-org
2021-07-19 15:34:21 +01:00
99edfc24e5
Update eslint-plugin-matrix-org
2021-07-19 15:26:40 +01:00
1ea70e5b6e
Merge pull request #6402 from matrix-org/copy-room-link
...
Rename Copy Link to Copy Room Link
2021-07-19 15:14:19 +01:00
f9fbf6f210
Rename Copy Link to Copy Room Link
...
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
2021-07-19 15:05:04 +01:00
48817499e4
Merge pull request #6399 from matrix-org/t3chguy/fix/18032
...
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
2021-07-19 12:53:34 +01:00
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox
...
Fix bug where 'other homeserver' would unfocus
2021-07-19 10:09:03 +01:00
e54a7f0997
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
2021-07-19 09:36:25 +01:00
4ef4f49e90
Merge pull request #6392 from SimonBrandner/task/cleanup-replies
2021-07-18 13:37:44 +01:00
21eb299eff
Make roomStoreToken readonly
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-18 14:32:24 +02:00
096d0a7d12
Respect grapheme clustering in default avatar initial generation to not break emojis
2021-07-17 23:00:46 +01:00
d7e6856614
More delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:37:52 +02:00
e439d2e911
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:29:18 +02:00
7b45efc9e9
Fix EventTile typing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:28:02 +02:00
e3eac48d05
Cleanup _ReplyPreview.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:54 +02:00
c9a11af26b
Give singletonRoomViewStore a type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:53 +02:00
2a7787e12d
Convert ReplyPreview to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:42 +02:00
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors
2021-07-17 14:12:29 +01:00
88aa2182b6
Merge pull request #6395 from SimonBrandner/fix/image-view-title/18037
2021-07-17 14:11:43 +01:00
96acd6c9ef
Cleanup _ReplyThread.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:31 +02:00
03ce480066
Convert ReplyThread to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:21 +02:00
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies
2021-07-17 08:26:28 +02:00
6d4ae6481a
Add alt
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:21:46 +02:00
bb643010a9
Remove title
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:10:34 +02:00
2089127dad
Merge pull request #6352 from matrix-org/travis/notifications-2
...
Notification settings UI refresh
2021-07-16 23:56:48 -06:00
e3e7d945fd
Remove useless spread operator
2021-07-16 23:51:44 -06:00
d2de9b432c
Apply suggestions from code review
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 23:50:06 -06:00
0f15cee583
Merge pull request #6205 from robintown/text-for-event-perf
2021-07-17 00:08:34 +01:00
092fdf5e5e
Be consistent about MessagePanel setting lookups
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 18:46:29 -04:00
60bcdd3bf8
Fix types from js-sdk
2021-07-16 16:29:25 -06:00
158e6fa61c
Merge branch 'develop' into text-for-event-perf
2021-07-16 18:24:22 -04:00
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
45fb0e927f
Mention nested labels in comments
2021-07-16 22:35:53 +01:00
f9b45677d6
Fix bug where 'other homeserver' would unfocus
...
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.
Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
2021-07-16 22:27:31 +01:00
eefadf6a46
Fix tests
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 15:30:26 -04:00
aaa9040634
Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1
2021-07-16 19:58:38 +01:00
45e0515b39
Merge pull request #4399 from matrix-org/t3chguy/querystring
2021-07-16 19:57:24 +01:00
25e6a0e570
Match colors of room and user avatars in DMs
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 14:19:36 -04:00
41d5865dd7
Cleanup _ReplyTile.scss
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 19:26:04 +02:00
74bd7cad3f
remove unrelated change
2021-07-16 13:40:53 +01:00
Michael Telatynski