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 |
|