Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
69,131 Commits 1 Branch 646 Tags
develop
Commit Graph

69131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Ryan Stinnett 2d3163fef5 Remove Flow support 
We no longer use Flow, so this removes linting and compiling support. New code
should use TypeScript for static typing.
 2021-06-29 12:31:44 +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 4cfdad8aa2 Add spacing between toast buttons with cross browser support in mind 2021-06-29 11:59:13 +01:00
Michael Telatynski 2d568f9688 iterate ts support 2021-06-29 11:41:08 +01:00
Germain Souquet 652f57371a Migrate FilePanel to TypeScript 2021-06-29 11:38:19 +01:00
Michael Telatynski b70297c510 Merge pull request #6277 from matrix-org/t3chguy/fix/17793 
Fix back button on user info card after clicking a permalink
 2021-06-29 10:55:53 +01:00
Michael Telatynski b60c2c5d55 Fix e2e test right panel back behaviour 2021-06-29 10:37:30 +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 3fc4be0be9 Add return types to ABC Exporter 2021-06-29 11:40:26 +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 de6bc3f2ed Update src/utils/exportUtils/Exporter.ts 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:19:57 +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
Jaiwanth a92ddb3f27 Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:16:32 +05:30
Jaiwanth 7bbfaed500 Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:16:08 +05:30
Jaiwanth b626a3d5cb Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:15:46 +05:30
Jaiwanth 7a5aea1441 Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:15:20 +05:30
Jaiwanth 1014e9ea48 Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:14:56 +05:30
Jaiwanth 7b683a1f64 Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:14:24 +05:30
Jaiwanth efccf19e9e Update src/utils/exportUtils/exportUtils.ts 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:14:00 +05:30
Jaiwanth e6cb0666ef Update src/utils/exportUtils/exportUtils.ts 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:13:51 +05:30
Jaiwanth 4ddbe76fbd Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:13:38 +05:30
Jaiwanth f0d0b77b8c Update src/TextForEvent.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:13:14 +05:30
Aaron Raimist 734dbae248 Merge branch 'develop' into string-pl 2021-06-28 22:49:13 -05:00
Aaron Raimist 434b313850 Merge branch 'develop' into string-pl 2021-06-28 22:13:51 -05:00
Travis Ralston 7a4ceec985 Restore clamped dimensions on voice recorder waveform 2021-06-28 21:02:42 -06:00
Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240 2021-06-28 21:00:36 -06:00
Travis Ralston 964a97d59e Merge remote-tracking branch 'origin/develop' into travis/new-audio 2021-06-28 20:52:44 -06:00
Travis Ralston b6d9ecde8b Merge pull request #6240 from matrix-org/gsouquet/voice-messages-waveform-perf 
Improve audio recording performance
 2021-06-28 20:49:21 -06:00
Travis Ralston e519e704e9 Apply suggestions from code review 2021-06-28 20:40:11 -06:00
Michael Telatynski 86228e08d8 Merge pull request #6278 from matrix-org/t3chguy/fix/17738 2021-06-28 23:24:31 +01:00
Michael Telatynski 690656e3b2 Merge pull request #6281 from maunium/unread-notices 
Let m.notice messages mark a room as unread
 2021-06-28 19:14:15 +01:00
Tulir Asokan bf55672263 Remove unused import 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2021-06-28 21:08:19 +03:00
Tulir Asokan 188bd548c6 Let m.notice messages mark a room as unread 
The typescript conversion of Unread.js in matrix-org/matrix-react-sdk#6241
fixed a 6-year-old typo and stopped messages with msgtype=m.notice from being
counted as unread messages. This makes it very difficult to use rooms dedicated
for bot notices (like RSS or GitHub webhook bots).

Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2021-06-28 20:51:14 +03:00
Robin Townsend a11193e243 Group ACLs with MELS 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-28 12:36:40 -04:00
Michael Weimann d3bc7fe806 remove list keys 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-28 18:29:32 +02:00
Michael Weimann e685f1239d use null vars for context menu lists 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-06-28 18:29:32 +02:00