PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
34607 commits 1 branch 0 tags 338 MiB
Commit graph

14215 commits

Author SHA1 Message Date
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Michael Telatynski
0425b02982
Merge pull request #6295 from matrix-org/t3chguy/ts/10 2021-07-02 09:51:58 +01:00
Michael Telatynski
5d1a1b46f3 Fix instances of the Edit Message Composer's save button being wrongly disabled 2021-07-01 23:48:52 +01: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
88f691776f Use sleep from js-sdk as no point duplicating it 2021-07-01 22:55:27 +01:00
Michael Telatynski
c0fab6647d Use defer from js-sdk as it has a better ts definition 2021-07-01 22:50:06 +01:00
David Baker
53b89bbcd9
Merge pull request #6302 from matrix-org/dbkr/tsify_roomheader 
Convert RoomHeader to TS
 2021-07-01 21:33:11 +01:00
Michael Telatynski
c2545923c1 Use better types to make CI happy 2021-07-01 21:10:37 +01:00
Michael Telatynski
c80ba16ae9
Merge pull request #6296 from matrix-org/t3chguy/fix/17853 
Prevent RoomDirectory from exploding when filterString is wrongly nulled
 2021-07-01 21:07:35 +01:00
Michael Telatynski
c51e62a62b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/10 2021-07-01 21:01:06 +01:00
David Baker
eb1a22ab19 Add types 2021-07-01 21:00:54 +01:00
David Baker
38ed53d5d1
Oops, don't just blindly insert the commented type 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-01 20:58:51 +01:00
David Baker
3db95d607d
Use semicolons 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-07-01 20:57:56 +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
David Baker
e121e5bf8a nice try, vscode 2021-07-01 19:58:25 +01:00
David Baker
8bbb768825 Convert RoomHeader to TS 
Also add a type of OOBData... possibly this should be in the js-sdk,
but threepid invites themselves have a type in react-sdk so it can
live alongside it I guess (also I'm not entirely sure we actually
use it anymore...)
 2021-07-01 19:54:05 +01:00
David Baker
9ea4ca39c6 Be more like other arrow functions 2021-07-01 18:54:51 +01:00
David Baker
ae16efcf5b Remove rateLimitedFunc 2021-07-01 18:35:38 +01:00
Šimon Brandner
725f69a400
Add button to show all keybaord shortcuts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-01 19:03:49 +02:00
Šimon Brandner
e355bf0db1
Merge remote-tracking branch 'upstream/develop' into reorganize-preferences 2021-07-01 18:53:53 +02:00
David Baker
fdef1f9b68
Merge pull request #6299 from matrix-org/dbkr/tsify_setupencryptionbody 
Convert some Key Verification classes to TypeScript
 2021-07-01 15:33:15 +01:00
David Baker
c6d1dc7e8e lint 2021-07-01 15:11:18 +01:00
David Baker
7e8bb70621 Never mind, it wasn't even used 2021-07-01 14:55:00 +01:00
David Baker
66d95ed7b2 Fix button styling in verification bubbles 2021-07-01 14:51:20 +01:00
David Baker
676163d5cd convert NewSessionReviewDialog 2021-07-01 14:51:07 +01:00
David Baker
5d3b94b7c9 Convert VerificationRequestDialog 2021-07-01 14:22:58 +01:00
Michael Telatynski
04902fa2e4
Merge pull request #6292 from matrix-org/t3chguy/ts/9 2021-07-01 14:11:17 +01:00
David Baker
16fb24fa09 Remove unused prop 2021-07-01 14:03:01 +01:00
David Baker
642405dbd0 Use new types 2021-07-01 13:55:57 +01:00
David Baker
70a3679d43 more ts 2021-07-01 13:49:58 +01:00
David Baker
46b2f0404a Basic ts-ification of SetupEncryptionBody 2021-07-01 13:45:33 +01:00
Germain Souquet
9c93b9002f Add extra context for filtering out '>' for sanitizeHtml 2021-07-01 12:23:36 +01:00
Germain Souquet
04db8333e3 Fix typing and unused import 2021-07-01 12:13:43 +01:00
Germain Souquet
ede87129b2 Add a layout fallback for EventTile 2021-07-01 11:45:29 +01:00
Germain Souquet
d47194e61d Migrate SearchResultTile to TypeScript 2021-07-01 11:17:44 +01:00
Michael Telatynski
5c6466d824 use better types 2021-07-01 10:01:48 +01:00
Michael Telatynski
d354a0a23b Prevent RoomDirectory from exploding when filterString is wrongly nullified 2021-07-01 09:57:33 +01:00
Michael Telatynski
fcdb0a27d0 Convert EventTimeline, EventTimelineSet and TimelineWindow to TS 2021-07-01 09:53:54 +01:00
Michael Telatynski
30d027d2b4 fix js-sdk lib import 2021-07-01 08:29:53 +01:00
Michael Telatynski
6693993d08 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/9 2021-07-01 08:21:59 +01:00
Travis Ralston
da8a783ca0 lint 2021-06-30 14:51:18 -06:00
Travis Ralston
a5a4f2ed7d Fix linter + merge 2021-06-30 13:29:37 -06:00
Travis Ralston
12d7be2b6a Merge branch 'develop' into travis/new-audio 2021-06-30 13:25:41 -06:00
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
f3b4a21815 Remove Tinter reference 2021-06-30 09:02:00 +01:00
Germain Souquet
fdced3da1b Remove reminescent references to the tinter 2021-06-30 08:09:55 +01: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
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
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
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
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
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
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
Michael Telatynski
e43df0e3c6 delint 2021-06-28 16:11:38 +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
Michael Telatynski
c708afe216 Pull scroll_to_bottom up a level similarly to prevent it firing on NotifPanel/FilePanel when sending a message 2021-06-28 16:03:52 +01:00
Michael Telatynski
fd9e891647 Clean up by pulling listeners up to parent RoomView 2021-06-28 16:02:34 +01:00
Michael Telatynski
83af38a85f Fix multiple timeline panels handling composer and edit events 2021-06-28 15:56:37 +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
Travis Ralston
1874f3b963
Merge pull request #6269 from matrix-org/travis/encrypt-voice 
Encrypt the voice message file if needed
 2021-06-28 01:30:16 -06:00
J. Ryan Stinnett
18b470820d
Merge pull request #6270 from SimonBrandner/fix/presence/17786 
Fix hyper-precise presence
 2021-06-26 18:47:17 +01:00
Šimon Brandner
3c6612df93
Fix hyper-precise presence 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 07:53:42 +02:00
Travis Ralston
b5bb767b8f Appease the linter 2021-06-25 14:11:50 -06:00
Travis Ralston
cb0d2a2c4f Encrypt the voice message file if needed 
Fixes https://github.com/vector-im/element-web/issues/17729

"oops, should have done that"
 2021-06-25 13:54:05 -06:00
Michael Telatynski
4e6260e617 delint 2021-06-25 20:01:03 +01:00
Michael Telatynski
6d6995e6fb
Merge pull request #6265 from matrix-org/t3chguy/fix/17770 2021-06-25 15:43:33 +01:00
Michael Telatynski
1f27049a5d
Merge pull request #6257 from SimonBrandner/feature/pinned-click 2021-06-25 14:42:18 +01:00
Andrew Morgan
a8e2c1bc2a
Move the dial pad button next to Explore button from Create Room context menu (#6237) 
This commit moves the dial pad from a context menu to sit right by the explore button, in line with the designs in the linked issue. The dial pad button is only shown when PSTN support is detected.
 2021-06-25 11:45:15 +01:00
Michael Telatynski
1c8e24023e Fix space preview for when user cannot join the space 2021-06-25 11:00:27 +01:00