37b299412f
Fix merge conflicts
2020-06-18 15:47:26 +01:00
f2440388b1
Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options
2020-06-18 15:37:01 +01:00
b9fb9aae4a
Rename MessagePreview to EventTilePreview
2020-06-18 15:36:23 +01:00
0d3ea6c9d4
Merge branch 'joriks/font-scaling-message-preview' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-message-preview
2020-06-18 15:34:03 +01:00
997c7ffc96
Add missing semicolons
2020-06-18 15:26:53 +01:00
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview
2020-06-18 15:19:28 +01:00
adfe1ac9bf
Remove stray debug
2020-06-18 15:13:28 +01:00
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
ba0bc8f29c
Resolve "The Great Conflict"
2020-06-18 14:55:24 +01:00
291997421b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon
2020-06-18 14:54:20 +01:00
74174041bb
Remove semicolon in style
2020-06-18 14:53:12 +01:00
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
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
8f3a6fc30e
Consistent quotes
2020-06-18 07:48:36 -06:00
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
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
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
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
05d0309081
Lint a few semicolons
2020-06-18 14:32:43 +01:00
9760f94ff5
Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options
2020-06-18 14:04:31 +01:00
69969dfee8
Respond to review
...
- remove all refs to getsdk
- i18n
- some lints
2020-06-18 13:58:35 +01:00
a579ea95db
Lint and i18n
2020-06-18 13:28:24 +01:00
3c268a31c8
i18n
2020-06-18 10:48:18 +01:00
793c6c549e
Unused import
2020-06-18 10:45:15 +01:00
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
e0a34d9dea
Revert "Use recovery keys over passphrases"
2020-06-18 09:35:11 +01:00
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
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
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
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
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
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
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
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
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
ff98242d14
clean up and fix the isMasterRuleEnabled logic
2020-06-17 16:31:42 +01:00
17476a5e73
Merge pull request #4781 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2020-06-17 15:54:07 +01:00
52ae812ef9
Translated using Weblate (Galician)
...
Currently translated at 74.6% (1706 of 2287 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-17 14:52:43 +00:00
c00d0af986
Translated using Weblate (Albanian)
...
Currently translated at 99.9% (2284 of 2287 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-06-17 14:52:38 +00:00
759940edf6
Merge branch 'origin/develop' into Weblate.
2020-06-17 14:28:45 +00:00
5c3aaf46c1
Translated using Weblate (Galician)
...
Currently translated at 72.3% (1654 of 2287 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-17 14:28:44 +00:00
d2831ffb0c
Merge pull request #4758 from matrix-org/travis/room-list/sticky
...
Sticky and collapsing headers for new room list
2020-06-17 08:28:38 -06:00
63447413ca
Replace class block with reference to class
2020-06-17 08:28:22 -06:00
59f7b5353a
Merge branch 'origin/develop' into Weblate.
2020-06-17 14:25:11 +00:00
00a6277cad
Translated using Weblate (Galician)
...
Currently translated at 71.8% (1643 of 2287 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-17 14:25:11 +00:00
97d87867eb
Merge pull request #4780 from matrix-org/travis/room-list/reload
...
Make the room list labs setting reload on change
2020-06-17 08:25:06 -06:00
7b85325cc1
Merge branch 'origin/develop' into Weblate.
2020-06-17 14:24:37 +00:00
0ffb36ac80
Translated using Weblate (Galician)
...
Currently translated at 71.7% (1640 of 2287 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-17 14:24:37 +00:00
07f13f2ece
Merge pull request #4767 from matrix-org/travis/room-list/tombstone
...
Handle/hide old rooms in the room list
2020-06-17 08:24:27 -06:00
5f2d92c607
Make the room list labs setting reload on change
...
Should fix confusing signals sent by having the room list visible but non-functional.
2020-06-17 08:21:08 -06:00
Jorik Schellekens