imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
35264 commits 222 branches 563 tags 470 MiB
Commit graph

5367 commits

Author SHA1 Message Date
Michael Telatynski
a8c4aabb52 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/i18n/strings/en_EN.json
 2021-05-07 11:50:49 +01:00
Michael Telatynski
6338ced8a3
Merge pull request #5977 from matrix-org/t3chguy/fix/17176 
Iterate Spaces admin UX around room management
 2021-05-07 11:47:45 +01:00
Germain Souquet
17099c656b Call renamed room::decryptAllEvents method 2021-05-07 11:25:25 +01:00
Michael Telatynski
6137162786 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1 
 Conflicts:
	src/stores/room-list/RoomListStore.ts
 2021-05-07 10:40:07 +01:00
Michael Telatynski
4079b03ae0 Bring back filter all spaces behaviour 2021-05-07 10:39:35 +01:00
Michael Telatynski
6f28964b49
Merge pull request #5979 from matrix-org/t3chguy/spaces-logs 
Guard all isSpaceRoom calls behind the labs flag
 2021-05-07 10:28:14 +01:00
Michael Telatynski
d9912651d6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
 2021-05-06 13:06:50 +01:00
Michael Telatynski
d47eecbd24 Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent 2021-05-06 13:05:58 +01:00
Germain Souquet
0c87a67caf Lazily decrypt events on room view 2021-05-06 11:46:25 +01:00
J. Ryan Stinnett
683aec1066
Merge pull request #5833 from SimonBrandner/feed 
Support for multiple streams (not MSC3077)
 2021-05-06 11:20:09 +01: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
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Michael Telatynski
68210b1415
Merge pull request #5963 from matrix-org/t3chguy/fix/17119 
Update space ordering behaviour to match updates in MSC
 2021-05-05 22:26:45 +01:00
Michael Telatynski
650933096a Iterate Spaces admin UX around room management 2021-05-05 17:25:29 +01:00
Michael Telatynski
886959f32d port rate limiting code over to space creation wizard's add existing rooms 2021-05-05 11:54:14 +01:00
Michael Telatynski
a70be45b6e Experiment switching the Home Space out for an All rooms space 2021-05-04 18:26:49 +01:00
Michael Telatynski
ac61c8eca8 Adhere to updated sort order for space children 2021-05-04 12:27:27 +01:00
Michael Telatynski
a7642b2b24 Fix space name "Empty room" during creation wizard 2021-05-04 10:48:34 +01:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Michael Telatynski
8dbcc85249
Merge pull request #5944 from matrix-org/t3chguy/fix/17043 
Inhibit sending RR when context switching to a room
 2021-04-30 15:13:18 +01:00
Michael Telatynski
39ccecab03
Merge pull request #5950 from matrix-org/t3chguy/fix/17117 
Prevent room list keyboard handling from landing focus on hidden nodes
 2021-04-30 12:55:27 +01:00
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998 
Make the text filter search all spaces instead of just the selected one
 2021-04-30 12:53:38 +01:00
Michael Telatynski
042ca65806 fix beta dot showing up when beta is disabled 2021-04-30 12:32:42 +01:00
Michael Telatynski
43410835a3 Prevent room list keyboard handling from landing focus on hidden nodes 2021-04-30 11:53:56 +01:00
Šimon Brandner
2e62b18617
Revert some changes to avoid re-translation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-30 12:30:14 +02:00
Šimon Brandner
c6bd2c7d67
Fix some more formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 20:18:26 +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
Šimon Brandner
232b87a3b4
Improve formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 19:57:02 +02:00
Michael Telatynski
73abe51fb9 actually use the new state 2021-04-29 16:46:21 +01:00
Michael Telatynski
62198601d2 Tweak room list filter placeholder and results copy for spaces 2021-04-29 16:40:08 +01:00
Michael Telatynski
279654cc9e Design iterations based on PR feedback 2021-04-29 16:08:59 +01:00
Michael Telatynski
036bc50b5d Disable groups routes when spaces is enabled to avoid confusion 2021-04-29 12:29:22 +01: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
Michael Telatynski
e390c3c732 Inhibit sending RR when context switching to a room 2021-04-29 09:37:21 +01:00
Michael Telatynski
9f8955fb6c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/16628 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-04-28 22:49:36 +01:00
Michael Telatynski
1802adb4d2 Iterate styling and decoration for the beta prompts 2021-04-28 22:47:08 +01:00
Ayush PS
81f2e67443 Fixed Linting errors 2021-04-28 23:40:23 +05:30
Ayush PS
8b644e783e Finally fixes two todays 2021-04-28 23:23:51 +05:30
Travis Ralston
b90c845fcb
Revert "Fixes the two Todays problem in Redaction" 2021-04-28 10:07:22 -06:00
Travis Ralston
e53b3b6634
Merge pull request #5917 from DantrazTrev/Redact 
Fixes the two Todays problem in Redaction
 2021-04-28 09:51:43 -06:00
Travis Ralston
baef98253e
Merge pull request #5920 from aaronraimist/page-up-down 
Fix page up/down scrolling only half a page
 2021-04-28 09:51:36 -06:00
Michael Telatynski
5a921bf38a Add beta pill to space create menu 2021-04-28 12:10:03 +01:00
Šimon Brandner
551e8ecb8d
Merge branch 'develop' into feed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-28 10:52:23 +02:00
Michael Telatynski
9dff5cd596 tweak leave space on preview 2021-04-28 08:59:02 +01:00
Michael Telatynski
18a01d9271 Show spaces beta prompt when viewing a space without the beta 2021-04-28 08:41:31 +01:00
Ayush PS
e2ce699130 Fixed linting warnings in MessagePanel.js 2021-04-28 10:02:20 +05:30
Michael Telatynski
46d35411b4 Add animated mx_BetaDot atop the legacy Communities button 2021-04-27 17:01:22 +01: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
Travis Ralston
b9bd83ad41 Handle possible edge case with getting stuck in "unsent messages" bar 
Just in case we're not cleaning up the isResending state properly, here's a catch all.

Unrelated to https://github.com/vector-im/element-web/issues/17078 (this code doesn't affect the js-sdk error the author is seeing)
 2021-04-27 08:58:18 -06:00