David Baker
|
c47a05cc48
|
Merge pull request #6121 from SimonBrandner/feature/call-event-tile
Add VoIP event tiles
|
2021-07-20 13:31:53 +01:00 |
|
Šimon Brandner
|
9e5b149291
|
Fix event highlighthing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 14:23:28 +02:00 |
|
Michael Telatynski
|
d8c4ab53e0
|
Merge pull request #6347 from robintown/emojibase-updates
|
2021-07-20 12:57:00 +01:00 |
|
Robin Townsend
|
cc40dd7998
|
Move some code around for clarity
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-20 07:47:31 -04:00 |
|
Robin Townsend
|
bd80201643
|
Constrain emoji skins type even further
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-20 07:46:54 -04:00 |
|
Šimon Brandner
|
6cb1c5d918
|
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 13:20:30 +02:00 |
|
Šimon Brandner
|
dd6379cf4b
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 13:15:04 +02:00 |
|
Michael Telatynski
|
770de8f6b5
|
Merge pull request #6408 from matrix-org/t3chguy/eslint
|
2021-07-20 11:23:36 +01:00 |
|
Michael Telatynski
|
b94886a291
|
i18n irc and fix lint from merge conflict
|
2021-07-20 11:18:27 +01:00 |
|
J. Ryan Stinnett
|
364bee9ebd
|
Merge pull request #6414 from matrix-org/gsouquet/fix-jsx-coma
Remove unwanted coma in EventTile
|
2021-07-20 11:16:54 +01:00 |
|
Michael Telatynski
|
d3934ff7da
|
Merge branch 'develop' into t3chguy/eslint
|
2021-07-20 11:08:13 +01:00 |
|
Germain Souquet
|
e38682d75c
|
Remove unwanted coma in EventTile
|
2021-07-20 12:05:18 +02:00 |
|
Michael Telatynski
|
9fe9534e01
|
fix three lints
|
2021-07-20 10:33:52 +01:00 |
|
Germain
|
53ae7817bc
|
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
|
2021-07-20 10:22:41 +01:00 |
|
Germain Souquet
|
dd65d47fba
|
lint fix
|
2021-07-20 11:12:17 +02:00 |
|
Michael Telatynski
|
848b83015d
|
not sure how these happened :/
|
2021-07-20 09:37:54 +01:00 |
|
Michael Telatynski
|
e6869797d7
|
remove unused prop
|
2021-07-20 09:27:32 +01:00 |
|
Germain Souquet
|
06c9a060b4
|
Merge branch 'develop' into gsouquet/message-bubbles-4635
|
2021-07-20 10:16:21 +02:00 |
|
Michael Telatynski
|
53b0ef20f4
|
Update eslint-plugin-matrix-org
|
2021-07-20 09:15:25 +01:00 |
|
Michael Telatynski
|
e11e17eb85
|
Merge pull request #6411 from SimonBrandner/fix/sticker-placeholder/18014
|
2021-07-20 09:11:28 +01:00 |
|
Šimon Brandner
|
5db20d9431
|
Fix placeholder centering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 08:54:32 +02:00 |
|
Robin Townsend
|
e9963cd22c
|
Make emoji skins type more specific
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-19 21:57:03 -04:00 |
|
Robin Townsend
|
5614ef1675
|
Rename some variables since their purpose has changed
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-19 21:54:25 -04:00 |
|
Michael Telatynski
|
ce78cdf4ad
|
Conform to new react and typescript eslint rules
|
2021-07-19 22:43:11 +01:00 |
|
Robin Townsend
|
f8a922eaa1
|
Apply code review suggestions
including filling in gaps in emoji shortcode coverage.
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-19 15:09:15 -04:00 |
|
Michael Telatynski
|
b6feaf74bc
|
Merge pull request #6407 from robintown/uppercase-avatar-placeholders
|
2021-07-19 17:56:25 +01:00 |
|
Robin Townsend
|
b36c748940
|
Fix avatar placeholders not getting capitalized
Regressed by 096d0a7d12.
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-19 12:48:44 -04:00 |
|
Travis Ralston
|
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 |
|
Travis Ralston
|
6862d97961
|
APPEASE THY JSON
|
2021-07-19 10:18:15 -06:00 |
|
Travis Ralston
|
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 |
|
RiotRobot
|
676d2aa187
|
Resetting package fields for development
|
2021-07-19 16:16:18 +01:00 |
|
RiotRobot
|
13731177a3
|
Merge branch 'master' into develop
|
2021-07-19 16:14:58 +01:00 |
|
RiotRobot
|
e7ad33db0f
|
v3.26.0
|
2021-07-19 16:00:26 +01:00 |
|
RiotRobot
|
4d11d5d5ea
|
Prepare changelog for v3.26.0
|
2021-07-19 16:00:25 +01:00 |
|
Michael Telatynski
|
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 |
|
RiotRobot
|
3335ffa069
|
Upgrade matrix-js-sdk to 12.1.0
|
2021-07-19 15:54:25 +01:00 |
|
David Baker
|
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 |
|
David Baker
|
99edfc24e5
|
Update eslint-plugin-matrix-org
|
2021-07-19 15:26:40 +01:00 |
|
James Salter
|
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 |
|
James Salter
|
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 |
|
Michael Telatynski
|
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 |
|
Michael Telatynski
|
c1ed023e17
|
Update Twemoji fonts for Unicode Emoji 13.1
|
2021-07-19 10:45:26 +01:00 |
|
David Baker
|
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 |
|
Michael Telatynski
|
e54a7f0997
|
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
|
2021-07-19 09:36:25 +01:00 |
|
Michael Telatynski
|
4ef4f49e90
|
Merge pull request #6392 from SimonBrandner/task/cleanup-replies
|
2021-07-18 13:37:44 +01:00 |
|
Šimon Brandner
|
21eb299eff
|
Make roomStoreToken readonly
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-18 14:32:24 +02:00 |
|
Michael Telatynski
|
096d0a7d12
|
Respect grapheme clustering in default avatar initial generation to not break emojis
|
2021-07-17 23:00:46 +01:00 |
|
Šimon Brandner
|
d7e6856614
|
More delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 15:37:52 +02:00 |
|
Šimon Brandner
|
e439d2e911
|
Delint
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 15:29:18 +02:00 |
|
Šimon Brandner
|
7b45efc9e9
|
Fix EventTile typing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 15:28:02 +02:00 |
|