Commit Graph

25624 Commits (a82253ec964edb3b29bba3abe28ffe637cddaebe)

Author SHA1 Message Date
David Baker a82253ec96 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:18:48 +01:00
David Baker ee6af6ae9e Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:17:18 +01:00
David Baker a1592704a2 Unused code & import 2020-06-19 17:17:04 +01:00
David Baker 87ab0f9830
Merge pull request #4762 from matrix-org/dbkr/fix_verification_race
Look for existing verification requests after login
2020-06-19 17:06:02 +01:00
David Baker 3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
Damir Jelić e3ae05b6b9 Merge branch 'poljar/eventindex-user-version' into develop 2020-06-19 09:50:40 +02:00
Damir Jelić 253212d8c8 Merge remote-tracking branch 'origin/poljar/eventindex-new-encrypted-rooom' into develop 2020-06-19 09:50:22 +02:00
Damir Jelić ec4b350a82 Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop 2020-06-19 09:50:03 +02:00
Travis Ralston f136ba4a98
Merge pull request #4796 from matrix-org/travis/room-list/bug/crash-filter
Fix crash when filtering new room list too fast
2020-06-18 16:53:42 -06:00
Michael Telatynski e723d6115c
Merge pull request #4795 from matrix-org/t3chguy/hide_unknown_rooms_search
hide search results from unknown rooms
2020-06-18 23:20:12 +01:00
Travis Ralston 47fd7ab06c
Merge pull request #4794 from matrix-org/travis/room-list/mvp
Mark the new room list as ready for general testing
2020-06-18 15:59:42 -06:00
Travis Ralston 7191c01265 Fix crash when filtering new room list too fast
Fixes https://github.com/vector-im/riot-web/issues/14092

We were simply assuming we had a reference to a notification state, which might not be the case if we're between renders.
2020-06-18 15:52:55 -06:00
Michael Telatynski 3ac028565b i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-18 22:50:10 +01:00
Michael Telatynski eec42cff49 tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-18 22:49:39 +01:00
Travis Ralston 847f12c289 Update i18n 2020-06-18 15:47:30 -06:00
Travis Ralston 0e9ef8804d Mark the new room list as ready for general testing 2020-06-18 15:46:37 -06:00
Michael Telatynski 045def4566 hide search results from unknown rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-18 22:45:42 +01:00
Michael Telatynski 69c5aecfc7
Merge pull request #4784 from bocoup/extend-querymatcher-heuristic
Extend QueryMatcher's sorting heuristic
2020-06-18 19:36:42 +01:00
Mike Pennisi 2e0cb4746a fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 14:20:40 -04:00
Mike Pennisi 4ffc54d143 fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 13:24:02 -04:00
David Baker 9b9e6e04e3 Merge remote-tracking branch 'origin/develop' into dbkr/fix_verification_race 2020-06-18 15:12:06 +01:00
Jorik Schellekens 29d0cfc0b0
Merge pull request #4791 from matrix-org/joriks/semicolon
Lint ts semicolons (aka. The great semicolon migration)
2020-06-18 15:08:25 +01:00
Jorik Schellekens ba0bc8f29c Resolve "The Great Conflict" 2020-06-18 14:55:24 +01:00
Jorik Schellekens 291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
Jorik Schellekens 74174041bb Remove semicolon in style 2020-06-18 14:53:12 +01:00
David Baker 5b27a570a8
Merge pull request #4790 from matrix-org/revert-4686-dbkr/recovery_keys_over_passphrases
Revert "Use recovery keys over passphrases"
2020-06-18 14:51:22 +01:00
Travis Ralston c26513b1e3
Merge pull request #4783 from matrix-org/travis/room-list/sticky-headers-reliability
Clear `top` when not sticking headers to the top
2020-06-18 07:48:46 -06:00
Travis Ralston 8f3a6fc30e
Consistent quotes 2020-06-18 07:48:36 -06:00
Travis Ralston 4a5cc8557c
Merge pull request #4785 from matrix-org/travis/room-list/show-less-is-more
Don't show a 'show less' button when it's impossible to collapse
2020-06-18 07:46:32 -06:00
Travis Ralston b857c9d199
Merge pull request #4786 from matrix-org/travis/room-list/show-n-reliability
Fix show less/more button occluding the list automatically
2020-06-18 07:46:13 -06:00
Travis Ralston 87aece9997
Merge pull request #4787 from matrix-org/travis/room-list/performance-2
Improve room switching in the new room list
2020-06-18 07:46:03 -06:00
David Baker 27a9a7b4c1
Merge pull request #4789 from matrix-org/dbkr/remove_ssss_secret_cache_option
Remove labs option to cache 'passphrase'
2020-06-18 14:34:59 +01:00
Jorik Schellekens 05d0309081 Lint a few semicolons 2020-06-18 14:32:43 +01:00
David Baker 3c268a31c8 i18n 2020-06-18 10:48:18 +01:00
David Baker 793c6c549e Unused import 2020-06-18 10:45:15 +01:00
David Baker 54e235b0b9 Remove labs option to cache 'passphrase'
(which actually meant SSSS secrets)

Fixes https://github.com/vector-im/riot-web/issues/1392
2020-06-18 10:42:33 +01:00
David Baker e0a34d9dea
Revert "Use recovery keys over passphrases" 2020-06-18 09:35:11 +01:00
Travis Ralston 8db67743f7 Improve room switching in the new room list
For https://github.com/vector-im/riot-web/issues/14034

One of the largest issues with room switching was that we'd regenerate the entire list when the sticky room changes, which is obviously detrimental on larger accounts (and even some medium accounts). To work through this, we simply handle the NewRoom and RoomRemoved causes (used by the sticky room handling) as splices rather than in-place updates.

Overall this leads to a smoother experience as it means we're doing far less calculations and can even opt out of an update if it isn't required, such as a RoomRemoved cause being fired twice - the second one can result in an update not being required, saving render time.

This commit also includes a fix for handling update causes on the sticky room, as the room list loves to print errors when this happens. We don't need to handle any updates because once the sticky room changes it'll get re-added through NewRoom, causing the underlying algorithm to slot it in where needed, effectively handling all the missed updates.
2020-06-17 22:42:01 -06:00
Travis Ralston 245181cf80 Fix show less/more button occluding the list automatically
When the user would click 'show more' they would be presented with a 'show less' button that occluded the last room. 

Similarly, if they resized the list so that all their rooms would be shown and refreshed the page, they would find their last room covered by the button.

This changes the handling so that showAllClick() sets the height to numTiles + button padding, and adjusts the height calculations on render to deal with relative tiles.

This also removes the conditional padding of the resize handle, as we always occupy the 4px of space. It was leading to rooms getting trimmed slightly by the show N button.
2020-06-17 22:09:59 -06:00
Travis Ralston 1735da8cb1 Don't show a 'show less' button when it's impossible to collapse
Fixes https://github.com/vector-im/riot-web/issues/14076
2020-06-17 22:04:34 -06:00
Mike Pennisi 6af4d82ce7 Extend QueryMatcher's sorting heuristic
Use the order of the input keys as a signal for relative importance of
matches.

Signed-off-by: Mike Pennisi <mike@mikepennisi.com>
2020-06-17 23:41:41 -04:00
Travis Ralston 321889f95b Clear `top` when not sticking headers to the top
Fixes https://github.com/vector-im/riot-web/issues/14070
2020-06-17 20:01:03 -06:00
Travis Ralston 803b7bb30f
Merge pull request #4694 from justin-sleep/remove-escape-backslashes
Remove escape backslashes in non-Markdown messages
2020-06-17 11:06:04 -06:00
Michael Telatynski 13a25f37a9
Merge pull request #4778 from matrix-org/t3chguy/notifications0
Fix Styled Checkbox and Radio Button disabled state
2020-06-17 17:39:47 +01:00
Michael Telatynski f112d179f6
Merge pull request #4782 from matrix-org/t3chguy/fix_desktop_notifs
clean up and fix the isMasterRuleEnabled logic
2020-06-17 17:37:21 +01:00
Michael Telatynski 68ca8b3891
Merge pull request #4763 from matrix-org/t3chguy/slash_cmd_ci
Fix case-sensitivity of /me to match rest of slash commands
2020-06-17 17:36:53 +01:00
Travis Ralston 58671f014b
Merge pull request #4765 from matrix-org/travis/room-list/show-less
Add a 'show less' button to the new room list
2020-06-17 10:24:50 -06:00
Michael Telatynski ff98242d14 clean up and fix the isMasterRuleEnabled logic 2020-06-17 16:31:42 +01:00
Damir Jelić 2aa00cbf41 EventIndex: Bump our user version and delete the db if it's an old db. 2020-06-17 17:13:25 +02:00
Damir Jelić 9f9f24c624 BaseEventIndexManager: Add support to read/write user versions. 2020-06-17 17:12:13 +02:00