Michael Telatynski
f5630acea7
Adhere to better eslint rules
2021-07-23 10:35:10 +01:00
Germain Souquet
c155382445
Improve new layout switcher UI
2021-07-21 14:55:30 +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
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
Michael Telatynski
7c3c04d340
Fix instances of setState calls after unmount
2021-07-15 12:10:54 +01: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
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
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
Germain Souquet
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02: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
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
Š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
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
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
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
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
Š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
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
