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

1252 commits

Author SHA1 Message Date
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown 
Remove unused old stale feather-customised/globe.svg
 2021-07-21 11:20:41 +01:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
 2021-07-21 10:46:41 +01:00
Michael Telatynski
a58edcb241 tweak copy 2021-07-21 10:43:12 +01:00
Šimon Brandner
621aee6f9a
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:21:52 +02:00
Šimon Brandner
c16827272d
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-20 13:19:31 +02:00
Michael Telatynski
b94886a291 i18n irc and fix lint from merge conflict 2021-07-20 11:18:27 +01:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint 2021-07-20 11:08:13 +01:00
Germain Souquet
06c9a060b4 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-20 10:16:21 +02:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Travis Ralston
b31043b5eb Revert order of notification setting radios 
Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
 2021-07-19 10:15:42 -06:00
Michael Telatynski
de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
 2021-07-19 16:47:31 +01:00
Travis Ralston
e3e7d945fd Remove useless spread operator 2021-07-16 23:51:44 -06:00
Travis Ralston
60bcdd3bf8 Fix types from js-sdk 2021-07-16 16:29:25 -06:00
Travis Ralston
942cadc8a3 Merge branch 'develop' into travis/notifications-2 2021-07-16 16:20:23 -06:00
Šimon Brandner
651f19fb9b
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs 2021-07-16 10:21:30 +02:00
Travis Ralston
2690bb56f9 Remove code we don't seem to need 2021-07-15 13:39:54 -06:00
Michael Telatynski
7c3c04d340 Fix instances of setState calls after unmount 2021-07-15 12:10:54 +01:00
Michael Telatynski
dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx
 2021-07-15 10:04:48 +01:00
Šimon Brandner
18343d839c
Show MSC2285 only if supported by server 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-15 09:23:15 +02:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming 2021-07-15 08:07:03 +01:00
Michael Telatynski
57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1 2021-07-14 17:19:07 +01:00
Germain Souquet
789d078814 Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-14 16:26:22 +02:00
Šimon Brandner
226224b039
Allow sending hidden RRs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-14 15:12:35 +02:00
Paulo Pinto
4b6de3a011 Undo change that impacts analytics action 
We dont't want the analytics identitfier to change.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-14 11:10:17 +01:00
Robin Townsend
0117d513ea Consolidate disabling of history options 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-07-13 23:08:43 -04:00
Robin Townsend
d568e92e06 Merge branch 'develop' into e2ee-history-visibility 2021-07-13 23:07:11 -04:00
Paulo Pinto
76157a7b48 Standardise casing of integration manager 
Replace instances of 'Integration Manager' with 'Integration manager', when at start of
sentence, or 'integration manager' when not.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-13 16:28:44 +01:00
Paulo Pinto
6884b2aa6d Standardise spelling of identity server 
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-13 16:28:43 +01:00
Paulo Pinto
09d08882e3 Standardise casing of identity server 
Replace instances of 'Identity Server' with 'Identity server', when at start of
sentence, or 'identity server' when not.

Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
 2021-07-13 16:28:43 +01:00
Šimon Brandner
82e0bcea65
Remove unnecessary code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 13:44:00 +02:00
Šimon Brandner
d7acaa9fb0
Update onEncryptionChange dialog 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-13 13:38:48 +02:00
Germain Souquet
ba3e7e24ba Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-13 10:15:27 +02:00
Travis Ralston
8278b2273d Copy over the whole feature of changing the state for keywords entirely 2021-07-13 00:23:56 -06:00
Travis Ralston
4444ccb079 Appease the linter 2021-07-13 00:02:44 -06:00
Travis Ralston
ff7a18da56 Rewrite Notifications component for modern UI & processing 2021-07-12 23:57:54 -06:00
Travis Ralston
9556b61041 Crude conversion of Notifications.js to TS + cut out legacy code 
This is to make the file clearer during development and serves no practical purpose
 2021-07-12 18:30:42 -06:00
Travis Ralston
59e48ee0ba Convert NotificationUserSettingsTab to TS 2021-07-12 18:30:42 -06:00
Michael Telatynski
ae6eaa5acc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1 
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
 2021-07-12 18:58:18 +01:00
Šimon Brandner
90ecdac47b
Types! 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 19:22:09 +02:00
Šimon Brandner
c478b4efb5
Improve "Are you sure you want to make this encrypted room public?" dialog 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 19:20:19 +02:00
Šimon Brandner
0618460833
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-12 18:00:34 +02:00
J. Ryan Stinnett
1b39dbdb53
Merge pull request #6245 from aaronraimist/string-pl 
Do not honor string power levels
 2021-07-12 16:01:11 +01:00
Michael Telatynski
a645cebb49 Fix setTimeout/setInterval typing 2021-07-12 09:02:46 +01:00
Šimon Brandner
96100ffaf3
Fix styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 14:19:27 +02:00
Šimon Brandner
dbc37675a0
Simplifie the code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 14:15:36 +02:00
Šimon Brandner
cd95be147c
Finish TS conversion 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 13:45:39 +02:00
Šimon Brandner
dadfba9075
Add MediaDeviceKindEnum 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 13:08:39 +02:00
Šimon Brandner
866c1b76bd
Basic TS conversion 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 12:57:42 +02:00
Michael Telatynski
f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-09 08:13:39 +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
Germain Souquet
10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Germain Souquet
a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
Michael Telatynski
d004163177 Fix 2 new NPEs 2021-07-06 12:05:30 +01:00
Germain
7d6342fa40
Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Michael Telatynski
c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
Germain
47b297c2db
Merge pull request #5742 from SimonBrandner/reorganize-preferences 2021-07-05 09:33:21 +01:00
Germain Souquet
ef4d58c0d9 Migrate SetIntegrationManager to TypeScript 2021-07-03 12:08:56 +01: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
Michael Telatynski
912e192dc6 Tweak behaviour of setting restricted join rule 2021-07-02 15:18:27 +01:00
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Michael Telatynski
82119a08f7
Merge branch 'develop' into t3chguy/ts/11 2021-07-02 11:03:54 +01:00
Michael Telatynski
fb149c4ea2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-07-02 09:06:19 +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
Š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
Michael Telatynski
4c42313f99 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
 2021-07-01 12:47:34 +01:00
Germain Souquet
d9eec1c03b Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-06-30 08:58:20 +01:00
J. Ryan Stinnett
0551becafd Fix long lines 2021-06-29 13:42:51 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +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
Aaron Raimist
434b313850 Merge branch 'develop' into string-pl 2021-06-28 22:13:51 -05:00
Michael Telatynski
5facee56b0 Fix space settings using join rule private instead of invite 2021-06-25 10:41:45 +01:00
Aaron Raimist
7b7ad76fe4 Merge branch 'develop' into string-pl 2021-06-23 17:54:42 -05:00
Michael Telatynski
a8dfc4488f Convert more of js-sdk crypto and fix underscored field accesses 2021-06-23 14:47:24 +01:00
Šimon Brandner
58151d71c5
Handle mid-call output changes 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 10:09:53 +02:00
Šimon Brandner
9bceb40820
CallMediaHandler -> MediaDeviceHandler 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-23 09:26:33 +02:00
Aaron Raimist
38d0ab3c44
Do not honor string power levels 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-06-22 22:35:59 -05:00
Michael Telatynski
1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/room_settings/AliasSettings.tsx
 2021-06-22 22:02:09 +01:00
Michael Telatynski
5dc542f189 Iterate PR 2021-06-22 22:01:18 +01:00
Šimon Brandner
d74d3aaf73
Move copying into a separate method 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-22 08:19:57 +02:00
Šimon Brandner
0b1fbf7e53
Make version copiable 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-22 08:19:52 +02:00
Šimon Brandner
b3ac0c71e1
Fix access token copy button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-21 12:17:51 +02:00
Šimon Brandner
686e7d18c3
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-20 08:14:12 +02:00
Germain Souquet
3f1ca970d6 Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-18 12:27:00 +01:00
Michael Telatynski
566b8af2a4 Initial support for MSC3083 via MSC3244 2021-06-18 12:18:23 +01:00
Michael Telatynski
e508ff003b Clean up typing to Security Room Settings 2021-06-18 11:48:08 +01:00
Michael Telatynski
56fe7f8763 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-06-18 10:05:58 +01:00
Michael Telatynski
bf66a72054 Move JoinRule, GuestAccess, HistoryVisibility enums into the js-sdk 2021-06-18 10:05:46 +01:00
Michael Telatynski
3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Germain Souquet
ae5cd9d7ac Add new layout switcher UI 
Co-authored-by: Quirin Götz <codeworks@supercable.onl>
 2021-06-17 14:11:44 +01:00
Germain Souquet
de414cd0a6 Migrate UserSettingsDialog to TypeScript 2021-06-14 23:42:36 +01:00
Michael Telatynski
54241f44c2 delint 2021-06-08 16:40:01 +01:00
Michael Telatynski
90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +01:00
Michael Telatynski
fdecba2fe5 Make AliasSettings space-aware, remove stale unused props 2021-06-08 16:32:43 +01:00
Michael Telatynski
5c85ee1ea0 Make AdvancedRoomSettingsTab space-aware 2021-06-08 16:30:46 +01:00
Michael Telatynski
9454a4e6c7 Convert AdvancedRoomSettingsTab to Typescript 2021-06-08 16:28:02 +01:00