Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
39,930 Commits 1 Branch 646 Tags
4bf42babc740b5a7f4e5010a94de81a91eddc1e1
Commit Graph

16504 Commits

Author SHA1 Message Date
Michael Telatynski 3a80df4222 Fix react context not being assigned during construction 2021-06-30 13:45:43 +01:00
Michael Telatynski 0a5abb09f4 Fixes identified by TS 2021-06-30 13:03:29 +01:00
Michael Telatynski e768ecb3d0 Typescript conversion of Composer components and more 2021-06-30 13:01:26 +01:00
Germain Souquet d1c6cfe6b9 Improved message bubble layout (no reply) 2021-06-30 12:06:16 +01:00
Jaiwanth 08d886e9d1 Delint 2021-06-30 14:08:22 +05:30
Germain Souquet f3b4a21815 Remove Tinter reference 2021-06-30 09:02:00 +01:00
Germain Souquet 6b9dfa37c5 Migrate UnknownBody to TypeScript 2021-06-30 09:00:14 +01:00
Germain Souquet d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
Germain Souquet fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01:00
Jaiwanth 551639811b Merge and resolve conflicts 2021-06-30 12:29:13 +05:30
Jaiwanth a99b24ef83 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-06-30 11:20:01 +05:30
Jaiwanth 1b21c8f732 Remove unreadRoomId from summarized notification state 2021-06-30 10:53:46 +05:30
Jaiwanth 7d5db4689c Disable close icon during export 2021-06-30 10:03:33 +05:30
Robin Townsend 2021650d77 Merge branch 'develop' into watch-show-timestamps 2021-06-29 22:43:46 -04:00
Robin Townsend c0e10218d9 Fix lints 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-29 22:42:46 -04:00
Robin Townsend adb5df52a4 Merge branch 'develop' into text-for-event-perf 2021-06-29 22:13:18 -04:00
Michael Telatynski 29904a7ffc Merge pull request #6263 from matrix-org/t3chguy/ts/4 2021-06-29 22:31:16 +01:00
Michael Telatynski 6250d9ba61 Merge branch 'develop' into t3chguy/ts/4 2021-06-29 22:24:47 +01:00
Michael Telatynski a59e94b907 delint 2021-06-29 22:21:05 +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
J. Ryan Stinnett 21b8c81eb8 Merge remote-tracking branch 'origin/develop' into jryans/rework-linting-2 2021-06-29 15:25:30 +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
Germain 640fc591bb Merge pull request #6279 from matrix-org/gsouquet/deprecate-tinter 
Deprecate Tinter and TintableSVG
 2021-06-29 15:22:48 +01:00
Jaiwanth b0be7d2861 Add license and negate the conditional 2021-06-29 19:43:21 +05:30
J. Ryan Stinnett 0551becafd Fix long lines 2021-06-29 13:42:51 +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
Michael Telatynski 88cd5aeaf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/StyledRadioGroup.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-06-29 12:29:45 +01:00
Germain Souquet db015519ed Code style changes for FilePanel 2021-06-29 12:19:27 +01:00
Germain 56e05041fd Import curly spaces 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-29 12:13:41 +01:00
Germain Souquet 652f57371a Migrate FilePanel to TypeScript 2021-06-29 11:38:19 +01:00
J. Ryan Stinnett 14ef38e057 Merge pull request #6280 from robintown/group-acls 
Group ACLs with MELS
 2021-06-29 10:02:12 +01:00
Jaiwanth 746b11b24d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-06-29 14:31:08 +05:30
Michael Telatynski 0cc7f42f08 Merge pull request #6282 from matrix-org/t3chguy/fix/17738 
Fix editState not getting passed through
 2021-06-29 09:14:17 +01:00
Jaiwanth 497d8102e2 Handle mxc urls for non-encrypted rooms 2021-06-29 12:54:44 +05:30
Michael Telatynski 26592da09f Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
Michael Telatynski 298bf30b18 Fix editState not getting passed through 2021-06-29 08:16:43 +01:00
Jaiwanth 747273cc9c Convert input's value to string to use existing types 2021-06-29 12:06:58 +05:30
Jaiwanth 637e3afa48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-29 11:31:30 +05:30
Jaiwanth 6cbbc0ecb4 Replace hard coded forExport string by mxc url 2021-06-29 11:29:05 +05:30
Jaiwanth e404fa3cae Apply suggestions 2021-06-29 10:57:02 +05:30
Jaiwanth 025a7eb9a5 Iterate PR 2021-06-29 10:36:24 +05:30
Jaiwanth b506de0989 Update src/components/views/messages/MFileBody.js 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:19:11 +05:30
Jaiwanth 60c6af501b Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:18:17 +05:30
Jaiwanth 7a09bcb5a2 Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:17:38 +05:30
Jaiwanth e459f3841d Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:17:14 +05:30