Jorik Schellekens
d2fb30a211
Hide scrollbar without pixel jumping
2020-06-30 23:52:13 +01:00
Travis Ralston
2eaaf6a7bd
Merge pull request #4828 from matrix-org/travis/room-list/proliferation
...
Fix a number of proliferation issues in the new room list
2020-06-30 16:10:50 -06:00
J. Ryan Stinnett
b456529c3e
Merge pull request #4860 from matrix-org/jryans/read-marker-jump-invis-2
...
Fix jumping to read marker for events without tiles
2020-06-30 23:01:19 +01:00
Travis Ralston
9de42513dc
Handle sticky rooms when regenerating lists
...
`setKnownRooms` is called to regenerate the room list, and if we don't take the sticky room out of the equation we end up with the room being duplicated. So, to make this easy, we simply remove the sticky room and handle it after the fact.
2020-06-30 15:04:47 -06:00
Travis Ralston
da2fd35094
Add sanity check to ensure we don't accidentally proliferate rooms
...
This small check just ensures that we aren't about to blindly accept that the calling code knows what it is doing. There are some unknown cases where NewRoom gets fired for rooms we already know about, so in those cases we just change it to a PossibleTagChange which is what the caller likely intended.
Many of the edge cases are unknown, though this can happen for an invite being accepted (for example). It's easier to handle it here instead of tracking down every single possibility and fixing it higher up.
2020-06-30 14:36:11 -06:00
Travis Ralston
6a191ea3ee
Handle room invites as new rooms
...
We wouldn't have seen them before, so might as well treat them as new instead of tag changes.
2020-06-30 14:23:00 -06:00
Travis Ralston
223ee0dbdb
Add locking to avoid index corruption
...
When a new room is added there's a fairly good chance that the other events being dispatched will happen in the middle of (for example) the room list being re-sorted. This commit wraps the entire handleRoomUpdate() function for the underlying algorithms in a lock so that if we're unlucky enough to get an update while we're sorting (as the ImportanceAlgorithm splices out what it is sorting) we won't scream about invalid index errors.
2020-06-30 13:55:53 -06:00
Travis Ralston
c7a83e65f0
Fix proliferation when joining upgraded rooms
...
We have to do a bit of a dance to return the sticky room to the list so we can remove it, if needed, and ensure that we generally swap the rooms out of the list.
2020-06-30 13:55:15 -06:00
Michael Telatynski
52b52dfec4
Merge pull request #4859 from matrix-org/t3chguy/dedup-rooms-autocomplete
...
De-duplicate rooms from the room autocomplete provider
2020-06-30 20:18:34 +01:00
J. Ryan Stinnett
51118863c7
Fix jumping to read marker for events without tiles
...
It is possible for your read marker to be set to an event without a tile (like a
reaction). We would still render the read marker at the position of those events
in the timeline, even though there's no matching tile, which breaks a core
assumption of jump to read marker path: it assumes that if the read marker node
is present in the DOM, then there must also be an event tile with a scroll token
matching the event ID.
This fixes the situation by setting a scroll token on the read marker so it can
always be scrolled to, no matter what kind of event it might represent.
Fixes vector-im/riot-web#10975
2020-06-30 18:40:52 +01:00
David Baker
2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2
...
Add file upload button to recovery key input
2020-06-30 18:06:12 +01:00
David Baker
7caf2d5459
remove rogue blank line
2020-06-30 17:56:50 +01:00
David Baker
21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2
...
Implement new design on security setup & login
2020-06-30 17:55:03 +01:00
Michael Telatynski
55e0df3e00
Merge pull request #4856 from matrix-org/t3chguy/fix-join-slashcmd
...
Fix /join slash command via servers including room id as a via
2020-06-30 17:36:15 +01:00
Michael Telatynski
f269aefe18
Merge pull request #4855 from matrix-org/t3chguy/download_toast
...
Add Generic Expiring Toast and timing hooks
2020-06-30 17:02:04 +01:00
Michael Telatynski
446f3e35e9
Merge pull request #4846 from matrix-org/t3chguy/notifications0
...
Fix Room Custom Sounds regression and make ProgressBar relevant again
2020-06-30 16:56:57 +01:00
Michael Telatynski
cd06910713
Merge pull request #4854 from matrix-org/t3chguy/fix-redirect-loop
...
Including start_sso and start_cas in redirect loop prevention
2020-06-30 16:56:38 +01:00
Michael Telatynski
7d7bafb1ea
De-duplicate rooms from the room autocomplete provider
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 16:23:52 +01:00
David Baker
1e457994f9
More padding between header & text in radio button
2020-06-30 11:10:12 +01:00
Travis Ralston
bb9ae7b55b
Merge pull request #4850 from matrix-org/travis/room-list/todo-cleanup
...
Clean up TODO comments for new room list
2020-06-29 13:10:52 -06:00
Michael Telatynski
9f6893ef2b
Fix /join slash command via servers including room id as a via
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 16:27:59 +01:00
RiotRobot
0059d44e15
Merge branch 'master' into develop
2020-06-29 16:10:32 +01:00
RiotRobot
e43311c0f4
v2.8.1
2020-06-29 15:59:37 +01:00
RiotRobot
9329be3bb8
Prepare changelog for v2.8.1
2020-06-29 15:59:36 +01:00
Michael Telatynski
b2b909aa53
Including start_sso and start_cas in redirect loop prevention
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 15:40:20 +01:00
J. Ryan Stinnett
7c9b8baf09
Merge pull request #4852 from matrix-org/jryans/no-4s-release
...
Support accounts with cross signing but no SSSS
2020-06-29 14:14:15 +01:00
J. Ryan Stinnett
518db90b69
Support accounts with cross signing but no SSSS
...
Port https://github.com/matrix-org/matrix-react-sdk/pull/4717 to release
2020-06-29 13:55:06 +01:00
Michael Telatynski
1a1b7e5e70
Add Generic Expiring Toast
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 11:38:50 +01:00
Michael Telatynski
51b813e250
add timing/interval/expiry hooks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 11:35:14 +01:00
Michael Telatynski
d477a49160
ToastStore fix type definition
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 11:34:58 +01:00
J. Ryan Stinnett
d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp
...
Show timestamp of redaction on hover
2020-06-29 11:10:25 +01:00
Travis Ralston
175ade8ac4
Merge branch 'develop' into travis/room-list/todo-cleanup
2020-06-28 20:04:41 -06:00
Travis Ralston
a36a03bd05
Merge pull request #4849 from matrix-org/travis/room-list/remove-dm
...
Remove the DM button from new room tiles
2020-06-28 20:04:12 -06:00
Travis Ralston
62467144ba
Update i18n
2020-06-28 20:03:55 -06:00
Travis Ralston
ee2c216c4d
Clean up TODO comments for new room list
...
All relevant TODOs should still be present, and reference an issue for easy finding.
2020-06-28 20:03:04 -06:00
Travis Ralston
753f7aa5b8
Remove the DM button from new room tiles
...
Fixes https://github.com/vector-im/riot-web/issues/14221
2020-06-27 22:48:54 -06:00
Travis Ralston
b9ce10bd6d
Merge pull request #4848 from Georift/room-list/fix-show-less-visibility
...
Hide room list show less button if it would do nothing
2020-06-27 22:22:51 -06:00
☕ Tim
c8381021b8
Hide room list show less button if it would do nothing
...
Signed-off-by: ☕ Tim <tim@wants.coffee>
On the new rooms list, if the show less button wouldn't result in a
smaller list, don't show it.
Fixes vector-im/riot-web#14219
2020-06-28 04:08:06 +08:00
Michael Telatynski
10492fe72f
fix StyledRadioGroup React key warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-27 18:30:15 +01:00
David Baker
2969820371
LINT
2020-06-26 20:31:22 +01:00
David Baker
0579c9f748
Fix tests
2020-06-26 20:25:38 +01:00
David Baker
916f606872
Apparently we need to null check here
2020-06-26 19:07:39 +01:00
David Baker
04d660517b
i18n
2020-06-26 18:58:12 +01:00
David Baker
5f2127ddf5
Disable spellcheck on the recovery key entry
2020-06-26 18:55:23 +01:00
David Baker
24baf19d65
Set field validity (ie. border colour) correctly
...
Changes flagInvalid to forceValidity which can force valid as well
as invalid.
2020-06-26 18:50:05 +01:00
David Baker
b74674ced8
Right name for security key and fix cancel button
2020-06-26 18:04:06 +01:00
Michael Telatynski
cf3c914382
Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0
2020-06-26 15:35:36 +01:00
David Baker
15ebaa1470
Port recovery key upload button to new designs
2020-06-26 15:22:04 +01:00
Travis Ralston
5172c7b205
Merge pull request #4823 from matrix-org/travis/room-list/preview-copy
...
Improve message preview copy in new room list
2020-06-26 07:33:19 -06:00
Travis Ralston
67cc84d00d
Merge branch 'develop' into travis/room-list/preview-copy
2020-06-26 07:29:49 -06:00