Jorik Schellekens
1e39279a77
Merge pull request #4761 from matrix-org/joriks/appearance-advanced
...
Custom font selection
2020-06-23 15:38:50 +01:00
J. Ryan Stinnett
3829362754
Fix up merge to develop
2020-06-23 15:24:02 +01:00
RiotRobot
6161f95434
Merge branch 'master' into develop
2020-06-23 15:18:35 +01:00
Jorik Schellekens
680e997a94
Cleanup tooltip classnames
2020-06-23 13:38:50 +01:00
Travis Ralston
115c850d35
Use the correct timeline reference for message previews
...
Fixes https://github.com/vector-im/riot-web/issues/14083 (hopefully)
This is the same logic used by `Unread.js`, so should be correct.
2020-06-22 15:57:13 -06:00
Travis Ralston
fc5ee64fce
Fix read receipt handling in the new room list
...
Fixes https://github.com/vector-im/riot-web/issues/14064
Fixes https://github.com/vector-im/riot-web/issues/14082
Turns out the event doesn't reference a room, so we need to use the accompanied room reference instead.
2020-06-22 15:12:30 -06:00
Travis Ralston
fb551781c2
Force DMs to always be red notifications
...
This also passes the tagId to the sublist so it doesn't have to rip it out of the `layout`. It doesn't get a layout until later anyways, which causes some null issues.
2020-06-22 14:52:17 -06:00
Travis Ralston
894357f7f6
Merge branch 'develop' into travis/room-list/unread-2
2020-06-22 14:16:52 -06:00
Travis Ralston
26317b6826
Merge pull request #4803 from matrix-org/travis/room-list/setting-diff
...
Only fire setting changes for changed settings
2020-06-22 14:16:24 -06:00
Travis Ralston
edafb2467d
Merge pull request #4804 from matrix-org/travis/room-list/watchers
...
Trigger room-specific watchers whenever a higher level change happens
2020-06-22 14:15:53 -06:00
Travis Ralston
1fe3e33dbf
Factor out cloning to a util and use it everywhere
2020-06-22 14:14:43 -06:00
Travis Ralston
aca6c65ef3
Merge pull request #4810 from matrix-org/travis/room-list/theme
...
Have the theme switcher set the device-level theme to match settings
2020-06-22 13:53:03 -06:00
Travis Ralston
f66f220a3e
Merge pull request #4808 from matrix-org/travis/room-list/collapsed
...
Fix layout of minimized view for new room list
2020-06-22 13:51:38 -06:00
Travis Ralston
6c48966bf5
Have the theme switcher set the device-level theme to match settings
...
Fixes https://github.com/vector-im/riot-web/issues/14111
This is a shortcut into the Appearance tab, so use the same level. It was an explicit decision to have the tab set the theme at the device level.
2020-06-22 13:34:49 -06:00
Travis Ralston
1a427b8ff7
Fix sticky headers over/under extending themselves in the new room list
...
Fixes https://github.com/vector-im/riot-web/issues/14095
2020-06-22 13:09:42 -06:00
Travis Ralston
cf92fc37d4
Fix layout of minimized view for new room list
2020-06-22 12:51:53 -06:00
J. Ryan Stinnett
38bf1680a2
Update read receipt remainder for internal font size change
...
In https://github.com/matrix-org/matrix-react-sdk/pull/4725 , we changed the
internal font size from 15 to 10, but the `toRem` function (currently only used
for read receipts remainders curiously) was not updated. This updates the
function, which restores the remainders.
Fixes https://github.com/vector-im/riot-web/issues/14127
2020-06-22 19:23:39 +01:00
J. Ryan Stinnett
37442b92ae
Update read receipt remainder for internal font size change
...
In https://github.com/matrix-org/matrix-react-sdk/pull/4725 , we changed the
internal font size from 15 to 10, but the `toRem` function (currently only used
for read receipts remainders curiously) was not updated. This updates the
function, which restores the remainders.
Fixes https://github.com/vector-im/riot-web/issues/14127
2020-06-22 19:02:03 +01:00
Travis Ralston
64a811fb03
Merge branch 'travis/room-list/setting-diff' into travis/room-list/unread-2
2020-06-22 11:24:26 -06:00
Travis Ralston
9e3c101172
Clone reads of account data to prevent mutation
2020-06-22 11:24:04 -06:00
Travis Ralston
784e73831b
Move setting to account only (no per-room)
2020-06-22 11:23:38 -06:00
Travis Ralston
cbee9146a6
Merge branch 'travis/room-list/setting-diff' into travis/room-list/unread-2
2020-06-22 10:57:40 -06:00
Travis Ralston
fe65b7631d
Soften warning about lack of rooms in setting updates
2020-06-22 10:57:08 -06:00
Travis Ralston
63ad14ae1e
Clean up imports
2020-06-22 10:35:55 -06:00
Travis Ralston
137603c36d
Merge branch 'travis/room-list/watchers' into travis/room-list/unread-2
2020-06-22 10:34:59 -06:00
Travis Ralston
241e0c12f0
Trigger room-specific watchers whenever a higher level change happens
...
Otherwise the room list badges end up having to listen to `null` for a room ID, meaning they have to filter.
The notification badge count setting is the first ever setting to watch based on a room ID, so there are no compatibility concerns with this change.
2020-06-22 10:28:05 -06:00
Travis Ralston
8201eed929
Encourage counts if the user has a mention (red state)
2020-06-22 10:26:37 -06:00
Travis Ralston
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
Travis Ralston
099661c2aa
Only fire setting changes for changed settings
...
Previously we were firing updates for everything, which is bad. This has an effect of causing the room list to update itself every time the user goes to toggle some account settings.
2020-06-22 10:18:38 -06:00
Jorik Schellekens
7bc5ce7271
Underscore actions
2020-06-22 16:05:32 +01:00
Jorik Schellekens
d54676aefe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced
2020-06-22 15:35:48 +01:00
Jorik Schellekens
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
Jorik Schellekens
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
Jorik Schellekens
3d7427ccca
Fix semicolons
2020-06-22 11:39:11 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced
2020-06-22 11:27:48 +01:00
Weblate
bfad8afead
Merge branch 'origin/develop' into Weblate.
2020-06-22 08:34:26 +00:00
васян228
e19469a0c3
Translated using Weblate (Russian)
...
Currently translated at 87.1% (1987 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2020-06-22 08:34:26 +00:00
Imre Kristoffer Eilertsen
b80b01076c
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 62.1% (1416 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
2020-06-22 08:34:26 +00:00
ziriSut
ac869cf6dc
Translated using Weblate (Kabyle)
...
Currently translated at 5.6% (127 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
2020-06-22 08:34:16 +00:00
take100yen
abbacd788c
Translated using Weblate (Japanese)
...
Currently translated at 58.0% (1323 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-06-22 08:34:15 +00:00
aWeinzierl
92fb9356be
Translated using Weblate (German)
...
Currently translated at 99.6% (2273 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-06-22 08:34:12 +00:00
XoseM
d9b870c5fd
Translated using Weblate (Galician)
...
Currently translated at 82.6% (1886 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-22 08:34:11 +00:00
Priit Jõerüüt
6f9c6ffd5f
Translated using Weblate (Estonian)
...
Currently translated at 66.3% (1512 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-06-22 08:34:06 +00:00
ziriSut
7dfbdb73c5
Translated using Weblate (Kabyle)
...
Currently translated at 5.0% (113 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
2020-06-21 09:51:58 +00:00
ziriSut
0c2f5b81cb
Translated using Weblate (Kabyle)
...
Currently translated at 3.1% (70 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
2020-06-21 05:18:41 +00:00
Slimane Selyan AMIRI
a5fd441880
Translated using Weblate (Kabyle)
...
Currently translated at 3.1% (70 of 2282 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
2020-06-21 05:18:40 +00:00
Slimane Selyan AMIRI
565fd12770
Added translation using Weblate (Kabyle)
2020-06-20 16:01:57 +00:00
David Baker
d1caadec9f
Add null check
2020-06-19 20:07:20 +01:00
David Baker
6e4a2b7efe
i18n
2020-06-19 17:22:53 +01:00
David Baker
a82253ec96
Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss
2020-06-19 17:18:48 +01:00