Commit graph

35372 commits

Author SHA1 Message Date
Š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
Šimon Brandner
1b74286cf0
/me has managed to steel something by accident
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:11:23 +02:00
Šimon Brandner
3250b35151
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:10:31 +02:00
Travis Ralston
097cc858ce Remove hover effect from files in the files panel 2021-07-19 10:07:16 -06:00
Šimon Brandner
5d5b9f6022
Better labeling of images and stickers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:04:33 +02:00
Šimon Brandner
28f5827884
Add FileUtils
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:02:33 +02: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
Dariusz Niemczyk
5acc7fe8d4
Make errorText properly optional instead of null 2021-07-19 16:49:39 +02: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
Dariusz Niemczyk
9e9992078b
Update src/@types/global.d.ts
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-19 16:34:07 +02:00
Dariusz Niemczyk
97d490c1b6
Update src/components/views/auth/CaptchaForm.tsx
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-19 16:28:30 +02:00
Dariusz Niemczyk
c2394b9161
Fix styling comments 2021-07-19 16:27:39 +02: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
Dariusz Niemczyk
9de5ebd4de
Fix grecaptcha throwing useless error sometimes 2021-07-19 15:41:44 +02: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
Travis Ralston
70e525d672 Fix component export 2021-07-18 17:06:30 -06:00
Robin Townsend
c0123f5dad Merge branch 'develop' into watch-show-timestamps 2021-07-18 11:47:44 -04: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
Šimon Brandner
e3eac48d05
Cleanup _ReplyPreview.scss
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:54 +02:00
Šimon Brandner
c9a11af26b
Give singletonRoomViewStore a type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:53 +02:00
Šimon Brandner
2a7787e12d
Convert ReplyPreview to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:42 +02:00
Michael Telatynski
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors 2021-07-17 14:12:29 +01:00
Michael Telatynski
88aa2182b6
Merge pull request #6395 from SimonBrandner/fix/image-view-title/18037 2021-07-17 14:11:43 +01:00
Šimon Brandner
96acd6c9ef
Cleanup _ReplyThread.scss
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:31 +02:00
Šimon Brandner
03ce480066
Convert ReplyThread to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:21 +02:00
Šimon Brandner
75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies 2021-07-17 08:26:28 +02:00