OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
25,847 Commits
216 Branches
561 Tags
481 MiB
Commit Graph

25847 Commits (d477a491607dc80c3ea617a914a8d67bd4b5cf7f)

Author SHA1 Message Date
RiotRobot 6739c90f44 Fix SDK in changelog 2020-06-23 15:25:59 +01:00
J. Ryan Stinnett 3829362754 Fix up merge to develop 2020-06-23 15:24:02 +01:00
RiotRobot f3af603102 Reset matrix-js-sdk back to develop branch 2020-06-23 15:19:55 +01:00
RiotRobot 6161f95434 Merge branch 'master' into develop 2020-06-23 15:18:35 +01:00
RiotRobot 5256a86545 v2.8.0 2020-06-23 15:06:53 +01:00
RiotRobot 059d5f927d Prepare changelog for v2.8.0 2020-06-23 15:06:52 +01:00
RiotRobot 54ba75afd7 Upgrade matrix-js-sdk to 7.0.0 2020-06-23 14:48:23 +01:00
Jorik Schellekens 680e997a94 Cleanup tooltip classnames 2020-06-23 13:38:50 +01:00
J. Ryan Stinnett dabc2abfc6
Merge pull request #4807 from matrix-org/jryans/read-reader-remainder-size-release 
Update read receipt remainder for internal font size change
 2020-06-23 11:14:51 +01:00
Travis Ralston d61d243284
Merge pull request #4812 from matrix-org/travis/room-list/previews 
Use the correct timeline reference for message previews
 2020-06-22 16:16:13 -06: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 bd2c585a72
Merge pull request #4811 from matrix-org/travis/room-list/update-idle 
Fix read receipt handling in the new room list
 2020-06-22 15:16:54 -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 3c88f6ed81
Merge pull request #4805 from matrix-org/travis/room-list/unread-2 
Improve unread/badge states in new room list (mk II)
 2020-06-22 14:58:45 -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 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
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
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