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 |
|
Michael Telatynski
|
d004163177
|
Fix 2 new NPEs
|
2021-07-06 12:05:30 +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 |
|
Š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
|
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 |
|
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 |
|
Michael Telatynski
|
5facee56b0
|
Fix space settings using join rule private instead of invite
|
2021-06-25 10:41:45 +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 |
|
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
|
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 |
|
Germain Souquet
|
d7a5547d80
|
use Intl.Collator over String.prototype.localeCompare for better performance
|
2021-06-02 10:42:17 +01:00 |
|
Šimon Brandner
|
7e165384fd
|
Merge branch 'develop' into reorganize-preferences
|
2021-05-22 17:25:04 +02: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 |
|
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 |
|
Š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 |
|