PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
25792 commits 1 branch 0 tags 338 MiB
Commit graph

25792 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +01:00
Jorik Schellekens
adfe1ac9bf Remove stray debug 2020-06-18 15:13:28 +01:00
David Baker
5a310cfd85
Merge pull request #4793 from matrix-org/revert-4686-rel-2 
Revert "Use recovery keys over passphrases"
 2020-06-18 15:12:56 +01:00
David Baker
9b9e6e04e3 Merge remote-tracking branch 'origin/develop' into dbkr/fix_verification_race 2020-06-18 15:12:06 +01:00
Weblate
f6e55345a1 Merge branch 'origin/develop' into Weblate. 2020-06-18 14:08:30 +00: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
David Baker
e4d824839a Revert "Use recovery keys over passphrases" 2020-06-18 15:02:03 +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
Weblate
199f776e58 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:51:27 +00: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
Weblate
08fd9cda4f Merge branch 'origin/develop' into Weblate. 2020-06-18 13:48:51 +00: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
Weblate
9a05f5bc03 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:37 +00: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
Weblate
c6eaac8b80 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:18 +00: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
Weblate
385d784036 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:46:08 +00: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
Jorik Schellekens
47a825be7c
Merge branch 'develop' into joriks/appearance-advanced 2020-06-18 14:41:28 +01:00
Weblate
a1db9dd352 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:35:07 +00:00
Szimszon
45a6bf3a6d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-18 13:35:07 +00:00
XoseM
f1365a8d30 Translated using Weblate (Galician) 
Currently translated at 76.1% (1740 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-18 13:35:07 +00:00
Kévin C
5ceae3085c Translated using Weblate (French) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-18 13:35:04 +00:00
Jeff Huang
9b90dcd1a8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2287 of 2287 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-18 13:35:04 +00: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
Jorik Schellekens
9760f94ff5 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 14:04:31 +01:00
Jorik Schellekens
69969dfee8 Respond to review 
- remove all refs to getsdk
- i18n
- some lints
 2020-06-18 13:58:35 +01:00
Jorik Schellekens
a579ea95db Lint and i18n 2020-06-18 13:28:24 +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
RiotRobot
b5aa66015c v2.8.0-rc.1 2020-06-17 21:46:34 +01:00
RiotRobot
2533c33c54 Prepare changelog for v2.8.0-rc.1 2020-06-17 21:46:33 +01:00
RiotRobot
dd23a50a3c Upgrade matrix-js-sdk to 7.0.0-rc.1 2020-06-17 21:40:30 +01:00
Weblate
9f42796577 Merge branch 'origin/develop' into Weblate. 2020-06-17 17:06:09 +00: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
Weblate
1fb5a6f6b3 Merge branch 'origin/develop' into Weblate. 2020-06-17 16:39:51 +00: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
Weblate
e577c68dbd Merge branch 'origin/develop' into Weblate. 2020-06-17 16:37:27 +00: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