mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 12:31:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
34775 commits 219 branches 562 tags 474 MiB
Commit graph

10593 commits

Author SHA1 Message Date
Michael Telatynski
fc05395dba Don't close settings dialog when opening spaces feedback prompt 2021-07-08 13:24:16 +01:00
Šimon Brandner
14687f3630
Merge remote-tracking branch 'upstream/develop' into fix/focus-composer-reaction/11023 2021-07-08 13:19:46 +02:00
Šimon Brandner
64f32a9fc1
Focus composer after reacting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 13:12:57 +02:00
David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage 
Update import location for types
 2021-07-08 09:18:31 +01:00
David Baker
086a8cbbb3 Update import location for types 
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
 2021-07-07 20:19:52 +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
Michael Telatynski
882e66e215 remove stale comment, we include vias now 2021-07-07 18:17:33 +01:00
Michael Telatynski
b9a539eaa2 Improve URL Previews 
only show 2 by default with expand/collapse mechanism
show all hashes again, but dedup requests
clean up hide mechanism, instead of one `x` per preview have one per group
 2021-07-07 18:04:30 +01:00
Germain
209cafb1f5
Merge pull request #6308 from SimonBrandner/burn-sdk-get-comp-with-fire 2021-07-07 16:30:54 +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
Michael Telatynski
25dab1eb64
Merge pull request #6307 from matrix-org/t3chguy/fix/17858 
Fix instances of the Edit Message Composer's save button being wrongly disabled
 2021-07-07 16:03:27 +01:00
Michael Telatynski
30fa5419db
Revert "ignore hash/fragment when de-duplicating links for url previews" 2021-07-07 14:30:08 +01:00
Šimon Brandner
1220ad37ce
Remove the usage of symbol 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:44 +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
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Germain
47b297c2db
Merge pull request #5742 from SimonBrandner/reorganize-preferences 2021-07-05 09:33:21 +01:00
Germain Souquet
925d434d53 Linting fix in TypeScript interface 2021-07-05 09:19:19 +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
Germain Souquet
b5ff7eb7d2 Migrate VerificationShowSas to TypeScript 2021-07-03 12:43:18 +01:00
Germain Souquet
103caffb5b Delete unused VerificationQREmojiOPtions 2021-07-03 12:35:14 +01:00
Germain Souquet
a1135783bc Migrate VerificationComplete to TypeScript 2021-07-03 12:32:08 +01:00
Germain Souquet
b18691a1cb Migrate VerificationCancelled to TypeScript 2021-07-03 12:31:10 +01:00
Germain Souquet
ef4d58c0d9 Migrate SetIntegrationManager to TypeScript 2021-07-03 12:08:56 +01:00
Germain Souquet
ef2848664f Migrate InlineTermsAgreement to TypeScript 2021-07-03 12:03:00 +01:00
Šimon Brandner
916589e2b9
Eighth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:24:33 +02: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
Šimon Brandner
ab4cd9d0fd
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 10:10:17 +02:00
Šimon Brandner
b7ef7d2a47
Fifth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 10:06:42 +02:00
Šimon Brandner
b36a727a09
Fourth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 18:15:05 +02:00
Šimon Brandner
799d10b77e
Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 2021-07-02 17:34:56 +02:00
Šimon Brandner
426c79f47d
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 17:25:30 +02:00
Šimon Brandner
7325abebd9
Third batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 17:19:01 +02:00
Šimon Brandner
9d569c378e
Second batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 17:08:27 +02:00
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
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
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
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
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
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
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
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
26592da09f
Merge pull request #5671 from weeman1337/msg-context-menu 2021-06-29 08:18:07 +01:00
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