Commit Graph
1961 Commits
Author SHA1 Message Date
Michael Telatynski b9be0896f1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/pins 2021-07-09 07:48:12 +01:00
Michael Telatynski 8e7e4c9e8d Convert MessageContextMenu to Typescript 2021-07-08 14:47:36 +01:00
Michael Telatynski 5d72ea5e19 Fix Space Create menu not disabling the alias field when busy 2021-07-08 13:24:56 +01:00
Michael Telatynski 4ce3723e84 Switch to blurhash-react instead of homegrown component
this has the advantage of resolution scaling logic to do more gpu accelerated scaling
2021-07-07 20:00:31 +01:00
Šimon Brandner f91b35a0a0 Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-07 17:12:19 +02:00
Šimon Brandner 38a061a2df Fix ImageView context menu
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-06 20:59:12 +02:00
Robin Townsend 055f3a72ad Fix being able to un-rotate images
Since 0 is falsy, this made it impossible to return images to 0 degrees
of rotation.

Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-03 15:18:47 -04:00
Šimon Brandner 6e14c290c8 Seventh batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:59:57 +02:00
Šimon Brandner 914de71e9c Sixth batch of burning
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-03 10:44:03 +02:00
David Baker 80f5232217 Comply with new member-delimiter-style rule
Just `eslint --fix` with rule from
https://github.com/matrix-org/eslint-plugin-matrix-org/pull/9 in place
2021-07-01 23:23:03 +01:00
Michael Telatynski 12cce2a938 delint 2021-07-01 20:51:13 +01:00
Michael Telatynski 1f337b28ac Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash
 Conflicts:
	src/ContentMessages.tsx
	src/components/structures/UploadBar.tsx
	src/components/views/messages/MImageBody.js
	src/components/views/messages/MStickerBody.js
	src/components/views/messages/MVideoBody.tsx
2021-07-01 20:48:34 +01:00
Michael Telatynski 8f4879ea96 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/ScrollPanel.tsx
	src/components/structures/TimelinePanel.tsx
	src/components/views/elements/ErrorBoundary.tsx
	src/components/views/elements/EventListSummary.tsx
	src/components/views/messages/TileErrorBoundary.tsx
2021-06-29 22:14:40 +01:00
J. Ryan Stinnett 782e793925 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:27:24 +01:00
Michael Telatynski 623317cd47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
 Conflicts:
	src/components/structures/MessagePanel.tsx
	src/components/structures/TimelinePanel.tsx
2021-06-29 15:22:54 +01:00
GermainandGitHub 640fc591bb Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter
Deprecate Tinter and TintableSVG
2021-06-29 15:22:48 +01:00
J. Ryan Stinnett fe123fc605 Rework lint comments 2021-06-29 13:35:43 +01:00
J. Ryan Stinnett bbdd93f592 Auto-fix more errors 2021-06-29 13:26:09 +01:00
J. Ryan Stinnett b501665971 Fix parsing errors 2021-06-29 13:23:13 +01:00
J. Ryan Stinnett ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
J. Ryan Stinnett 4c5720a573 Update lint comments 2021-06-29 12:51:13 +01:00
Robin Townsend a11193e243 Group ACLs with MELS
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-28 12:36:40 -04:00
Germain Souquet 6607294573 Deprecate Tinter and TintableSVG 2021-06-28 17:13:23 +01:00
Michael Telatynski 4e6260e617 delint 2021-06-25 20:01:03 +01:00
Michael Telatynski c5a1da49ce Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
 Conflicts:
	src/components/structures/AutoHideScrollbar.tsx
2021-06-24 16:42:03 +01:00
Michael Telatynski 0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
GermainandGitHub 35b8f79fbd Merge pull request #6228 from matrix-org/gsouquet/fix-17673 2021-06-23 09:08:43 +01:00
Michael TelatynskiandGitHub d5581f00cc Merge pull request #6239 from matrix-org/t3chguy/fix/17605 2021-06-22 22:56:49 +01:00
Michael Telatynski 9f20d6661d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +01:00
Michael Telatynski e4542e13d9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 2021-06-22 22:42:59 +01:00
Michael TelatynskiandGitHub bbdc28f56d Merge pull request #6241 from matrix-org/t3chguy/ts/7 2021-06-22 22:34:15 +01:00
Michael Telatynski ffaa19ef2c fix typing 2021-06-22 22:27:12 +01:00
Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Michael Telatynski 5dc542f189 Iterate PR 2021-06-22 22:01:18 +01:00
Michael TelatynskiandGitHub b3b9135b1f Merge pull request #6134 from matrix-org/t3chguy/fix/17529 2021-06-22 21:28:51 +01:00
Travis RalstonandGitHub 1180741cc2 Merge pull request #6000 from robintown/event-tile-preview-fixes
EventTilePreview fixes
2021-06-22 13:57:07 -06:00
Michael Telatynski cecf0ce299 Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript 2021-06-22 20:41:26 +01:00
Michael TelatynskiandGitHub 59052b1eb7 Merge pull request #6199 from matrix-org/t3chguy/fix/17665 2021-06-22 17:46:57 +01:00
Michael Telatynski e3e6b74272 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
 Conflicts:
	src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Michael Telatynski 59258585b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5 2021-06-22 17:28:19 +01:00
GermainandGitHub 5b72423ea3 Merge pull request #6230 from matrix-org/gsouquet/fix-17051 2021-06-22 15:07:04 +01:00
Michael Telatynski 66b3feb802 Fix keyboard accessibility of the space panel 2021-06-22 11:50:00 +01:00
Germain Souquet 3d3c428455 Fix DesktopBuildsNotice return type 2021-06-22 10:26:49 +01:00
Germain Souquet 7825c30bf7 Improve event index initialisation failure message in search bar for supported platforms 2021-06-21 15:41:47 +01:00
Germain Souquet adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
Germain Souquet 9756a99220 Migrate TruncatedList to TypeScript 2021-06-21 12:14:30 +01:00
Michael Telatynski 058cbbbd0c Fix imports 2021-06-18 16:13:55 +01:00
Michael Telatynski 7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Michael Telatynski 02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Germain Souquet 1a08af8ccf remove stray bullet point in reply preview 2021-06-17 08:45:09 +01:00