mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-12 05:20:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
26293 commits 219 branches 562 tags 474 MiB
Commit graph

26293 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
9d06d3943a Merge branch 'origin/develop' into Weblate. 2020-06-22 20:15:58 +00: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
Weblate
f85ea8ac99 Merge branch 'origin/develop' into Weblate. 2020-06-22 19:53:08 +00: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
Weblate
b31aa3d959 Merge branch 'origin/develop' into Weblate. 2020-06-22 19:51:42 +00: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
Weblate
c8ef9a6965 Merge branch 'origin/develop' into Weblate. 2020-06-22 19:51:33 +00:00
ziriSut
3054e6579a Translated using Weblate (Kabyle) 
Currently translated at 8.4% (192 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 19:51:33 +00:00
Priit Jõerüüt
326f336425 Translated using Weblate (Estonian) 
Currently translated at 68.9% (1576 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-22 19:51:32 +00:00
Travis Ralston
6dd20d80a3
Merge pull request #4809 from matrix-org/travis/room-list/headers-resize 
Fix sticky headers over/under extending themselves in the new room list
 2020-06-22 13:51:24 -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
Weblate
598fa96d17 Merge branch 'origin/develop' into Weblate. 2020-06-22 18:22:11 +00:00
Michael Albert
585af6ee84 Translated using Weblate (German) 
Currently translated at 99.7% (2281 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-22 18:22:10 +00:00
Priit Jõerüüt
d875c3170d Translated using Weblate (Estonian) 
Currently translated at 67.3% (1539 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-22 18:22:10 +00:00
Besnik Bleta
2319b25484 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2286 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-22 18:22:08 +00:00
J. Ryan Stinnett
de227c0650
Merge pull request #4806 from matrix-org/jryans/read-reader-remainder-size 
Update read receipt remainder for internal font size change
 2020-06-22 19:22:01 +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
30d8dc06fc Increase bold weight for unread rooms 
For https://github.com/vector-im/riot-web/issues/14084
 2020-06-22 10:25:10 -06:00
Travis Ralston
07d24c2b23 Merge branch 'travis/room-list/setting-diff' into travis/room-list/unread-2 2020-06-22 10:21:39 -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
Slimane Selyan AMIRI
4db2ede67f Translated using Weblate (Kabyle) 
Currently translated at 7.7% (177 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-22 15:41:20 +00:00
Jorik Schellekens
7bc5ce7271 Underscore actions 2020-06-22 16:05:32 +01:00
Jorik Schellekens
ea929e575a Fix MessageActionBar 2020-06-22 16:02:23 +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
13282bddad
Merge pull request #4801 from matrix-org/joriks/appearance-tab-nits 
Fix some appearance tab crash and implement style nits
 2020-06-22 15:19:20 +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
Jorik Schellekens
9f56036371
Merge pull request #4773 from matrix-org/joriks/appearance-tab-layout-options 
Add layout options to the appearance tab
 2020-06-22 11:22:16 +01:00
David Baker
de5d4222ad
Merge pull request #4800 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-06-22 09:49:21 +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