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

1193 commits

Author SHA1 Message Date
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
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
Travis Ralston
12e013508d
Merge pull request #6132 from matrix-org/travis/ts-mtxcli 
Adapt for js-sdk MatrixClient conversion to TS
 2021-06-04 00:07:22 -06:00
Germain Souquet
d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
Travis Ralston
3dc6cfbf34 Undo olmVersion handling 2021-06-01 22:31:08 -06:00
Travis Ralston
c9883f346c Build pass 1 2021-06-01 22:21:04 -06:00
Travis Ralston
5b2dacd99e Adapt for js-sdk MatrixClient conversion to TS 
For https://github.com/matrix-org/matrix-js-sdk/pull/1718
 2021-06-01 21:36:28 -06:00
Šimon Brandner
7e165384fd
Merge branch 'develop' into reorganize-preferences 2021-05-22 17:25:04 +02:00
Travis Ralston
e38d27f64e
Merge pull request #5915 from aaronraimist/initialisation 
Typo: initilisation -> initialisation
 2021-05-13 20:15:08 -06:00
Michael Telatynski
90538c95aa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 2021-05-06 08:05:14 +01:00
Aaron Raimist
9aa711b7b7 Merge branch 'develop' into initialisation 2021-05-06 00:09:48 -05:00
J. Ryan Stinnett
4bc5990071
Merge pull request #5755 from aaronraimist/warn-on-access-token-reveal 
Warn on access token reveal
 2021-05-05 16:32:12 +01:00
Aaron Raimist
35c1e54521
lint 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-30 21:55:00 -05:00
Aaron Raimist
626a4ccc34
Make warning bold, close copied tooltip on escape 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-30 21:45:37 -05:00
Šimon Brandner
70c8c64772
Rename to Keyboard shortcuts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-30 11:03:55 +02:00
Šimon Brandner
2c7139fb4d
Merge timeline section into one 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-30 11:03:22 +02:00
Šimon Brandner
192c0c4941
Fix method name 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-30 11:01:34 +02:00
Šimon Brandner
e2bee396bb
Merge branch 'develop' into reorganize-preferences 2021-04-30 10:55:29 +02:00
Robin Townsend
bd602e7089 Hide world readable history option in encrypted rooms 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-04-29 18:23:39 -04:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 20:08:14 +02:00
Michael Telatynski
a4f02937cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	res/css/structures/_SpaceRoomView.scss
	src/components/structures/SpaceRoomView.tsx
 2021-04-29 09:52:21 +01:00
Travis Ralston
3890bec8ad
Merge pull request #5860 from samhh/always-render-ignored-users 
Render ignored users setting regardless of if there are any
 2021-04-28 09:51:57 -06:00
Aaron Raimist
31ff05a862 Merge branch 'develop' into warn-on-access-token-reveal 2021-04-27 19:25:38 -05:00
Aaron Raimist
6754a0b483
Switch to <details> 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-27 19:12:22 -05:00
Michael Telatynski
c5f653245a Show Spaces beta card in Labs & My Communities view 
the image is temporary
 2021-04-27 16:29:42 +01:00
Šimon Brandner
46bfbbadf9
Enable indent rule and fix indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-27 17:23:27 +02:00
Germain
4d5fd3ec73
Merge pull request #5913 from matrix-org/gsouquet-desktop-i18n 2021-04-27 15:48:49 +01:00
J. Ryan Stinnett
1df0a82c64 Add types to PreferencesUserSettingsTab 2021-04-27 12:00:36 +01:00
J. Ryan Stinnett
4e7240ebc9 Add types to SecurityRoomSettingsTab 2021-04-27 11:56:45 +01:00
J. Ryan Stinnett
2ebd256590 Add types to RolesRoomSettingsTab 2021-04-27 11:42:11 +01:00
J. Ryan Stinnett
26bb7c08c2 Add join rule comment 2021-04-26 16:20:16 +01:00
J. Ryan Stinnett
d497d62db3 Use enums in SecurityRoomSettingsTab 2021-04-26 16:14:21 +01:00
J. Ryan Stinnett
bf43144f6e Add ActionPayload type 2021-04-26 15:21:49 +01:00
J. Ryan Stinnett
1b615eebc1 Fix optional props 2021-04-26 14:56:43 +01:00
J. Ryan Stinnett
a3a756fdb2 Rename history visibility type 2021-04-26 14:08:45 +01:00
J. Ryan Stinnett
69fbfdc552 Fix interface syntax 2021-04-26 14:07:45 +01:00
J. Ryan Stinnett
b8a915bb76 Tweak private / underscores for fields and methods 2021-04-26 14:02:53 +01:00
Germain Souquet
a43ad8d881 Allow for multiple locale and stabilise set language call 2021-04-26 13:55:14 +01:00
Aaron Raimist
f3c0fc96a3 Merge branch 'develop' into warn-on-access-token-reveal 2021-04-24 15:01:19 -05:00
J. Ryan Stinnett
f34489e2df Actually fix indent lint errors 2021-04-23 18:11:54 +01:00
Aaron Raimist
bf444ce22e
Typo: initilisation -> initialisation 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2021-04-23 11:31:30 -05:00
Germain Souquet
8f1ea84eb6 Broadcast language change to ElectroPlatform 2021-04-23 17:11:45 +01:00
J. Ryan Stinnett
d7e6f4b4b5 Add basic types 2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
0e92251f70 Fix simple lint errors 2021-04-23 16:28:55 +01:00
J. Ryan Stinnett
31a28b1a9e Update extensions for some files with types 
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
 2021-04-23 16:05:30 +01:00
Sam A. Horvath-Hunt
14b8b0f8da
Render ignored users setting regardless of if there are any 
Signed-off-by: Sam A. Horvath-Hunt <hello@samhh.com>
 2021-04-13 21:45:09 +01:00
Travis Ralston
073c05543c Give server ACLs a name in 'roles & permissions' tab 
The default power levels event includes them, so this helps avoid them showing up as "Send m.room.server_acl events".
 2021-04-08 19:20:08 -06:00
Travis Ralston
28d12016b7 Convert to using EventType enum 2021-04-08 19:18:30 -06:00
J. Ryan Stinnett
5d027ffcf4
Merge pull request #5694 from robintown/show-invite-reasons 
Show invite reasons
 2021-04-06 10:48:54 +01:00
Travis Ralston
4d72af7916
Merge pull request #5744 from panoschal/forgot-password-validation 
Require strong password in forgot password form
 2021-04-05 00:46:47 -06:00
Panagiotis
901d5a86d0 Merge branch 'develop' into forgot-password-validation 2021-04-01 12:39:25 +03:00
Panagiotis
d2f40a859b define PASSWORD_MIN_SCORE in one place and import from there 2021-04-01 12:30:49 +03:00
Germain Souquet
a4345811b0 Merge branch 'develop' into gsouquet-seshat-reset 2021-04-01 09:06:35 +01:00
Robin Townsend
2477258249 Merge branch 'develop' into show-invite-reasons 2021-03-31 16:13:29 -04:00