imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38600 commits 222 branches 563 tags 470 MiB
Commit graph

11926 commits

Author SHA1 Message Date
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
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
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
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
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
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
4ddbe76fbd
Update src/components/views/dialogs/ExportDialog.tsx 
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
 2021-06-29 10:13:38 +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
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
Germain Souquet
6607294573 Deprecate Tinter and TintableSVG 2021-06-28 17:13:23 +01:00
J. Ryan Stinnett
a8f5b7ebae
Merge pull request #5953 from DantrazTrev/Bubble-bericht 
Removes the override on the Bubble Container
 2021-06-28 16:23:40 +01:00
J. Ryan Stinnett
52b578fb3f
Merge pull request #6193 from SimonBrandner/fix/irc-layout-mxid/17648 
Fix IRC layout regressions
 2021-06-28 16:10:02 +01:00
Germain Souquet
6cb86057c5 Merge branch 'develop' into gsouquet/voice-messages-waveform-perf 2021-06-28 09:29:11 +01:00
Germain Souquet
652e06a7b1 remove cancelAnimationFrame complexity and rely on MarkedExecution class 2021-06-28 09:24:35 +01:00
Germain
a576362c74
Merge pull request #6275 from matrix-org/gsouquet/toast-button-kind 2021-06-28 09:10:09 +01:00
Germain Souquet
d669f55b60 Make toast dismiss button less prominent 2021-06-28 08:52:15 +01:00