8201eed929
Encourage counts if the user has a mention (red state)
2020-06-22 10:26:37 -06:00
eeb408a081
Update badge logic for new setting and behaviour
...
For https://github.com/vector-im/riot-web/issues/14084
2020-06-22 10:26:19 -06:00
aab42a291b
implement appearance tab nits
...
- fix border colours in dark theme
- lighten dark theme preview background
- add missing return statement
2020-06-22 12:28:15 +01:00
086177d808
Merge pull request #4770 from matrix-org/joriks/font-scaling-message-preview
...
Add message preview for font slider
2020-06-22 11:43:52 +01:00
ee6af6ae9e
Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss
2020-06-19 17:17:18 +01:00
a1592704a2
Unused code & import
2020-06-19 17:17:04 +01:00
3f936a1fe4
Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss
2020-06-19 16:50:29 +01:00
ec4b350a82
Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop
2020-06-19 09:50:03 +02:00
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
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
eec42cff49
tidy up
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-06-18 22:49:39 +01:00
045def4566
hide search results from unknown rooms
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-06-18 22:45:42 +01:00
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
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
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
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
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
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
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
2fcf30c1ec
Fix copy '!'
2020-06-17 14:39:44 +01:00
f08efc632f
Merge pull request #4777 from matrix-org/t3chguy/notifications0
...
Improve Field ts definitions some more
2020-06-17 02:21:47 +01:00
3dcf525382
Improve Field ts definitions some more
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-06-17 02:14:20 +01:00
9a85b82007
Merge pull request #4775 from matrix-org/t3chguy/notifications0
...
Fix Field ts def, fix LocalEchoWrapper and NotificationsEnabledController
2020-06-17 01:14:54 +01:00
b225324c49
improve Field typescript definition
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-06-17 01:05:10 +01:00
9878c1dc34
and another
2020-06-16 17:42:26 -06:00
7a71ef9b6b
Fix another space
2020-06-16 17:40:25 -06:00
daa552e250
Refactor listener usage
2020-06-16 17:35:56 -06:00
b69a5a525d
Fix spaces
2020-06-16 17:29:36 -06:00
e4a51a7c01
Add presence icons; Convert to generic icon component
...
For https://github.com/vector-im/riot-web/issues/14039
2020-06-16 14:44:37 -06:00
bcebef7e56
Add a globe icon to public rooms
...
For https://github.com/vector-im/riot-web/issues/14039
2020-06-16 12:13:12 -06:00
2192332968
Add layout options to the appearance tab
2020-06-16 17:55:19 +01:00
b27334f448
Use lower case import
2020-06-16 15:52:35 +01:00
Travis Ralston