sorb/ThreadNet-Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity
39,526 Commits 4 Branches 19 Tags
240cb10415bc161b81dad87028328fd803aa8253
Commit Graph
5876 Commits
Author SHA1 Message Date
Šimon Brandner f80f4620df Add pinned messages to MELS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-11 10:35:20 +02:00
Michael Telatynski 9b7697c530 fix imports 2021-07-10 16:02:43 +01:00
Michael Telatynski bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
Jaiwanth 6a4e2672f6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-10 19:18:01 +05:30
J. Ryan Stinnett 4b9d4ad1e3 Centralise display alias getters 2021-07-09 17:06:54 +01:00
Michael TelatynskiandGitHub 2998018876 Merge pull request #6322 from SimonBrandner/feature/remember-server/17739 
Remember the last used server for room directory searches
 2021-07-09 12:36:54 +01:00
Šimon Brandner 046b3f325c Iterate PR 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 12:31:44 +02:00
Šimon Brandner 6dcf860181 Refresh the room list only if validation failed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 10:44:20 +02:00
Šimon Brandner 84b00b5c38 Make the code more readable 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-09 10:39:02 +02:00
Šimon Brandner f78ede9324 Merge remote-tracking branch 'upstream/develop' into feature/remember-server/17739 2021-07-09 10:33:24 +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 7a1381135a Simplifie some code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 18:31:47 +02:00
Šimon Brandner 27db0da437 Simpler code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:40:41 +02:00
Šimon Brandner 68d194444a FocusComposer -> FocusSendMessageComposer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:36:31 +02:00
Šimon Brandner 7734f8aeef Handle focusing multiple composers 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-08 17:33:49 +02:00
Šimon Brandner 9c67679b35 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-07-08 13:30:57 +02:00
David BakerandGitHub 72acd5a611 Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage 
Update import location for types
 2021-07-08 09:18:31 +01:00
David Baker 086a8cbbb3 Update import location for types 
Apparently all the types themselves are fine, even though some of
the function signatures have been updated to return Promises... we
were alreaady await-ing on them.
 2021-07-07 20:19:52 +01:00
Šimon Brandner 14303a4ca8 Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 17:20:31 +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 55896223aa unbubble some type of events 2021-07-07 15:13:58 +02:00
Šimon Brandner 5b5ef5e04c Handle servers from settings 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:59:02 +02:00
Šimon Brandner 255ab49ccb Handle edge cases 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 13:48:48 +02:00
Germain Souquet 10bdb3cefa Merge branch 'develop' into gsouquet/message-bubbles-4635 2021-07-07 13:07:43 +02:00
Šimon Brandner b94dc2d0e5 Remember the last used server for room directory searches 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:51 +02:00
Šimon Brandner 1220ad37ce Remove the usage of symbol 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-07 12:14:44 +02:00
Michael Telatynski b88d67bb00 Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to Typescript 2021-07-07 11:08:53 +01:00
Germain Souquet 7d946ee0db Restore action bar 2021-07-07 12:04:28 +02:00
Germain Souquet fbac730c62 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 15:09:55 +02:00
Germain Souquet a5cec34bad Merge branch 'develop' into t3chguy/fix/17686 2021-07-06 14:53:40 +02:00
GermainandGitHub 7d6342fa40 Merge pull request #6315 from matrix-org/gsouquet/ts-1 2021-07-06 12:04:18 +01:00
Germain Souquet edae9a4844 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-06 10:19:25 +02: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 Souquet e7743e2a57 Migrate RoomScrollStateStore to TypeScript 2021-07-03 12:21:00 +01:00
Germain Souquet f4ec197513 Migrate ForgotPassword to TypeScript 2021-07-03 11:55:10 +01:00
Germain Souquet 298a338676 Migrate CompleteSecurity to TypeScript 2021-07-03 11:38:51 +01:00
Germain Souquet dbd102541e Migrate E2eSetup to TypeScript 2021-07-03 11:37:06 +01:00
Šimon Brandner 68011056cc Eleventh and final batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 12:24:07 +02:00
Šimon Brandner 5d054519dc Tenth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:57:05 +02:00
Šimon Brandner d99874318c Ninth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:51:23 +02:00
Šimon Brandner 916589e2b9 Eighth batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 11:24:33 +02:00
Šimon Brandner 6702e68778 Revert some changes due to them breaking tests (and hope it will work now) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-03 09:36:18 +02:00
Šimon Brandner 799d10b77e Merge remote-tracking branch 'upstream/develop' into burn-sdk-get-comp-with-fire 2021-07-02 17:34:56 +02:00
Michael Telatynski 171874ae30 Use FocusLock around ContextMenus to simplify focus management 2021-07-02 16:31:37 +01:00
Šimon Brandner 9d569c378e Second batch of burning 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 17:08:27 +02:00
Michael Telatynski 89949bd884 Add new in the spaces beta toast & explanatory modal 2021-07-02 16:07:17 +01:00
Jaiwanth 8c6f801486 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-07-02 16:58:04 +05:30
Šimon Brandner 9383ecc46f Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:20:02 +02:00
Šimon Brandner 85399e8edf Match code style 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:16:45 +02:00
Šimon Brandner b014763cd2 Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-07-02 13:14:14 +02:00