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

21152 commits

Author SHA1 Message Date
Travis Ralston
1b782ce5f2 Enable the new room list by default and trigger an initial render 
We have to trigger an initial render because during the login process the user will have started syncing (causing lists to generate) but the RoomList component won't be mounted & listening and therefore won't receive the initial lists. By generating them on mount, we ensure that the lists are present once the user gets through the login process.
 2020-07-02 14:27:36 -06:00
Travis Ralston
0d9ce0721f Don't include empty badge container in minimized view 
Fixes https://github.com/vector-im/riot-web/issues/14294

It takes up space, and it won't hold anything anyways.
 2020-07-02 14:11:31 -06:00
Travis Ralston
e08512020f Fix a couple badge alignment issues with community invites 2020-07-02 14:05:31 -06:00
Travis Ralston
aa702514ce Don't try and show context menus if we don't have one 
Fixes https://github.com/vector-im/riot-web/issues/14295
 2020-07-02 13:59:28 -06:00
Travis Ralston
e51f9d2492 Fix closing the context menu causing the tile to be selected 
Fixes https://github.com/vector-im/riot-web/issues/14293
 2020-07-02 13:53:38 -06:00
Travis Ralston
a5001e50aa Disable all unread decorations on muted rooms 2020-07-02 13:33:24 -06:00
Travis Ralston
349c3f7090 Only show mute notification icon on rooms, not all notif icons 2020-07-02 13:33:06 -06:00
Travis Ralston
45f4a2a980 Fix imports for NotificationStates 2020-07-02 13:28:06 -06:00
Travis Ralston
b54635863f Merge branch 'develop' into travis/room-list/notification-state 2020-07-02 13:26:16 -06:00
Travis Ralston
b65972d44f Fix indentation 2020-07-02 13:23:20 -06:00
Travis Ralston
43db4b98df Merge branch 'develop' into joriks/room-list-breadcrumbs 2020-07-02 13:22:51 -06:00
Michael Telatynski
4a03b464d6
Merge pull request #4875 from matrix-org/t3chguy/room-list/4 
Add click-to-jump on badge in the room sublist header
 2020-07-02 20:04:43 +01:00
Michael Telatynski
ae2a6ebc07 improve comments 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 19:56:41 +01:00
Michael Telatynski
a658612078 Add click-to-jump on badge in the room sublist header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 19:48:06 +01:00
Michael Telatynski
c4bbdefa8d
Merge pull request #4870 from matrix-org/t3chguy/room-list/2 
Room List v2 context menu interactions
 2020-07-02 18:02:21 +01:00
Travis Ralston
32642d592c Add a key 2020-07-02 09:27:42 -06:00
Travis Ralston
b7aa8203b6 Wedge community invites into the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14179

Disclaimer: this is all of the horrible because it's not meant to be here. Invites in general are likely to move out of the room list, which means this is temporary. Additionally, the communities rework will take care of this more correctly. For now, we support the absolute bare minimum to have them shown.
 2020-07-02 09:04:38 -06:00
Jorik Schellekens
1c0d46b6e1 Make breadcrumbs respsect setting 2020-07-02 15:26:51 +01:00
J. Ryan Stinnett
209b386e23 Merge remote-tracking branch 'origin/develop' into jryans/room-view-crypto-crash 2020-07-02 13:46:50 +01:00
J. Ryan Stinnett
a928785f72 Check whether crypto is enabled in room recovery reminder 
This avoids a soft crash that may occur otherwise.

Fixes https://github.com/vector-im/riot-web/issues/14289
 2020-07-02 13:19:27 +01:00
J. Ryan Stinnett
b5c94acbe6 Remove unused crypto import 2020-07-02 13:17:51 +01:00
Michael Telatynski
9fcc2ced3d fix types some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:59:06 +01:00
Michael Telatynski
07e0a017e7 fix types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:56:57 +01:00
Michael Telatynski
6802f9b4df unbreak copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:52:49 +01:00
Michael Telatynski
58718dab37 Convert ContextMenu to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:51:12 +01:00
Michael Telatynski
4b27a67e33 improve default behaviour for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:16:54 +01:00
Michael Telatynski
6424ffb22a fix repeated context menu interaction by not erroring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:13:54 +01:00
Michael Telatynski
e8702aafa5 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:09:02 +01:00
Michael Telatynski
5c2b291510 Support right click context menu interactions on Room List 2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:06:26 +01:00
Michael Telatynski
89bd572371 Fix context menu nesting causing bubbling and instabilities 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:05:37 +01:00
Jorik Schellekens
62314cac06
Merge pull request #4863 from matrix-org/joriks/room-list-autohide-scrollbar 
Hide scrollbar without pixel jumping
 2020-07-01 20:07:32 +01:00
Michael Telatynski
28e430060c
Merge pull request #4858 from matrix-org/t3chguy/room-list/2 
Room Tile context menu, notifications, indicator and placement
 2020-07-01 19:20:09 +01:00
Travis Ralston
51ce80f333 Merge branch 'develop' into travis/room-list/notification-state 2020-07-01 12:01:07 -06:00
Travis Ralston
2cd6fae2ce
Merge pull request #4865 from matrix-org/travis/room-list/default-vis 
Improve resizing interactions in the new room list
 2020-07-01 11:59:54 -06:00
Travis Ralston
946fde5cc5 Be consistent in visible tiles usage 2020-07-01 11:59:32 -06:00
Jorik Schellekens
d203943b7f lint semis 2020-07-01 16:07:27 +01:00
Jorik Schellekens
2162517a37 Display breadcrumbs only after 20 rooms have been joined 2020-07-01 16:05:27 +01:00
Jorik Schellekens
ad27dbbfab Clean up classnames 2020-07-01 15:15:18 +01:00
Michael Telatynski
9831698b1e Hide notifications menu from invite tiles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 14:28:00 +01:00
Michael Telatynski
10e547539d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-07-01 14:26:56 +01:00
Travis Ralston
fed0c327d5
Merge pull request #4866 from matrix-org/travis/room-list/rm-ordering-options 
Disable use of account-level ordering options in new room list
 2020-07-01 07:25:04 -06:00
Travis Ralston
a78728acbf
Merge pull request #4867 from matrix-org/travis/room-list/invite-menu 
Remove context menu on invites in new room list
 2020-07-01 07:24:52 -06:00
Travis Ralston
dc182b9012
Merge pull request #4868 from matrix-org/travis/room-list/preview-crash 
Fix reaction event crashes in message previews
 2020-07-01 07:24:43 -06:00
Michael Telatynski
3b7b6eca6f align context menus even better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 14:05:33 +01:00
strix aluco
9434923da3 Translated using Weblate (Ukrainian) 
Currently translated at 26.2% (618 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2020-07-01 13:03:55 +00:00
Michael Albert
1e81049801 Translated using Weblate (German) 
Currently translated at 99.2% (2336 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-07-01 13:03:54 +00:00
XoseM
5ca4d352ee Translated using Weblate (Galician) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-07-01 13:03:53 +00:00
Kévin C
2db0bb570a Translated using Weblate (French) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-07-01 13:03:50 +00:00
Jeff Huang
f09aa3b09b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-07-01 13:03:47 +00:00
Michael Telatynski
b5014282a4 Iterate PR based on Figma design and feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 13:59:50 +01:00
Jorik Schellekens
1dd9c1eea3 Use avatar sisze inplace 2020-07-01 12:28:32 +01:00
Jorik Schellekens
de7df7dcf9 Lint 2020-07-01 12:28:00 +01:00
Jorik Schellekens
1889ee202b Add tooltips for breadcrumbs 2020-07-01 12:23:27 +01:00
Travis Ralston
5a43acd42a Fix reaction event crashes in message previews 
Fixes https://github.com/vector-im/riot-web/issues/14224
 2020-06-30 19:51:28 -06:00
Travis Ralston
ad982624fe Remove context menu on invites in new room list 
Fixes https://github.com/vector-im/riot-web/issues/14198

For both, the decision has been made to not have a context menu pending further considerations of where invites should (and should not) be. Likely this will be dealt with in FTUE Notifications.
 2020-06-30 19:43:00 -06:00
Travis Ralston
0868af650a Appease the linter 2020-06-30 19:37:00 -06:00
Travis Ralston
d402808101 Disable use of account-level ordering options in new room list 
Fixes https://github.com/vector-im/riot-web/issues/14069

We can't drop them completely for compatibility with the old room list.
 2020-06-30 19:31:59 -06:00
Travis Ralston
8cfbfd4221 Increase RESIZER_BOX_FACTOR to account for overlap from handle 
Fixes https://github.com/vector-im/riot-web/issues/14136

The resizer handle wasn't being considered in this. 78% is both verified through mathematics and playing with it manually.
 2020-06-30 19:20:11 -06:00
Travis Ralston
7674030c6e Show 'show more' when there are less tiles than the default 
For example, if you only have 3/10 rooms required for the default then resize smaller, we should have a 'show more' button.

This works by changing the rendering to be slightly more efficient and only looping over what is seen (renderVisibleTiles(), using this.numTiles in place of tiles.length) and using a new setVisibleTilesWithin() function on the layout. Previously resizing the 3/10 case would be setting visibleTiles to ~8 instead of ~1 like it should (because the getter returns a default).
 2020-06-30 19:14:36 -06:00
Travis Ralston
8cfe12b817 Add a layout reset function 
For https://github.com/vector-im/riot-web/issues/14265

Intended to be accessed via `mx_RoomListStore2.resetLayout()`
 2020-06-30 18:52:44 -06:00
Travis Ralston
f935303eeb Change default number of rooms visible to 10 
Fixes https://github.com/vector-im/riot-web/issues/14266
 2020-06-30 18:51:59 -06:00
Jorik Schellekens
aab372c648 Add tooltips 2020-07-01 01:50:31 +01:00
Jorik Schellekens
d2fb30a211 Hide scrollbar without pixel jumping 2020-06-30 23:52:13 +01:00
Jorik Schellekens
2379ec577c Lint semicolons 2020-06-30 23:39:25 +01:00
Jorik Schellekens
0904ae8c7a Bug fixes 2020-06-30 23:35:59 +01:00
Jorik Schellekens
dcd51b5be3 Implement breadcrumb notifications and scrolling 2020-06-30 23:24:46 +01:00
Weblate
0326dba1c2 Merge branch 'origin/develop' into Weblate. 2020-06-30 22:10:59 +00:00
Travis Ralston
2eaaf6a7bd
Merge pull request #4828 from matrix-org/travis/room-list/proliferation 
Fix a number of proliferation issues in the new room list
 2020-06-30 16:10:50 -06:00
Weblate
93d3411bed Merge branch 'origin/develop' into Weblate. 2020-06-30 22:01:25 +00:00
J. Ryan Stinnett
b456529c3e
Merge pull request #4860 from matrix-org/jryans/read-marker-jump-invis-2 
Fix jumping to read marker for events without tiles
 2020-06-30 23:01:19 +01:00
Michael Telatynski
508dea1c89 Wire up Notifications context menu on room tile 2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:53:30 +01:00
Michael Telatynski
198958dcdd Iterate to match figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:32:59 +01:00
Michael Telatynski
cbd2a9cd35 Redo Iconized Context Menu styling to match Figma and simplify future a11y work by flattening the DOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:11:12 +01:00
Travis Ralston
9de42513dc Handle sticky rooms when regenerating lists 
`setKnownRooms` is called to regenerate the room list, and if we don't take the sticky room out of the equation we end up with the room being duplicated. So, to make this easy, we simply remove the sticky room and handle it after the fact.
 2020-06-30 15:04:47 -06:00
Michael Telatynski
2a12fd1f6e Fix User context menu alignment to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 21:58:54 +01:00
Travis Ralston
da2fd35094 Add sanity check to ensure we don't accidentally proliferate rooms 
This small check just ensures that we aren't about to blindly accept that the calling code knows what it is doing. There are some unknown cases where NewRoom gets fired for rooms we already know about, so in those cases we just change it to a PossibleTagChange which is what the caller likely intended. 

Many of the edge cases are unknown, though this can happen for an invite being accepted (for example). It's easier to handle it here instead of tracking down every single possibility and fixing it higher up.
 2020-06-30 14:36:11 -06:00
Travis Ralston
6a191ea3ee Handle room invites as new rooms 
We wouldn't have seen them before, so might as well treat them as new instead of tag changes.
 2020-06-30 14:23:00 -06:00
Michael Telatynski
fe4cf9f9b4 Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-06-30 21:16:37 +01:00
Travis Ralston
223ee0dbdb Add locking to avoid index corruption 
When a new room is added there's a fairly good chance that the other events being dispatched will happen in the middle of (for example) the room list being re-sorted. This commit wraps the entire handleRoomUpdate() function for the underlying algorithms in a lock so that if we're unlucky enough to get an update while we're sorting (as the ImportanceAlgorithm splices out what it is sorting) we won't scream about invalid index errors.
 2020-06-30 13:55:53 -06:00
Travis Ralston
c7a83e65f0 Fix proliferation when joining upgraded rooms 
We have to do a bit of a dance to return the sticky room to the list so we can remove it, if needed, and ensure that we generally swap the rooms out of the list.
 2020-06-30 13:55:15 -06:00
Travis Ralston
782a555e44 Make badges represent old list behaviour 
Fixes https://github.com/vector-im/riot-web/issues/14160
 2020-06-30 13:45:10 -06:00
Travis Ralston
393eaf84c3 Move notification states out of the NotificationBadge component 
Fixes https://github.com/vector-im/riot-web/issues/14153
 2020-06-30 13:34:44 -06:00
Weblate
bab10f8b6d Merge branch 'origin/develop' into Weblate. 2020-06-30 19:18:46 +00:00
Szimszon
d8bc20932e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2355 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-30 19:18:46 +00:00
Besnik Bleta
e83a941140 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2352 of 2355 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-30 19:18:41 +00:00
Michael Telatynski
52b52dfec4
Merge pull request #4859 from matrix-org/t3chguy/dedup-rooms-autocomplete 
De-duplicate rooms from the room autocomplete provider
 2020-06-30 20:18:34 +01:00
J. Ryan Stinnett
51118863c7 Fix jumping to read marker for events without tiles 
It is possible for your read marker to be set to an event without a tile (like a
reaction). We would still render the read marker at the position of those events
in the timeline, even though there's no matching tile, which breaks a core
assumption of jump to read marker path: it assumes that if the read marker node
is present in the DOM, then there must also be an event tile with a scroll token
matching the event ID.

This fixes the situation by setting a scroll token on the read marker so it can
always be scrolled to, no matter what kind of event it might represent.

Fixes vector-im/riot-web#10975
 2020-06-30 18:40:52 +01:00
Weblate
e5a7101f1a Merge branch 'origin/develop' into Weblate. 2020-06-30 17:06:17 +00:00
David Baker
2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2 
Add file upload button to recovery key input
 2020-06-30 18:06:12 +01:00
David Baker
7caf2d5459 remove rogue blank line 2020-06-30 17:56:50 +01:00
Weblate
4f899f2d34 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:55:09 +00:00
David Baker
21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2 
Implement new design on security setup & login
 2020-06-30 17:55:03 +01:00
Weblate
ab1472dc98 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:36:21 +00:00
Michael Telatynski
55e0df3e00
Merge pull request #4856 from matrix-org/t3chguy/fix-join-slashcmd 
Fix /join slash command via servers including room id as a via
 2020-06-30 17:36:15 +01:00
Weblate
8eb3d747b8 Merge branch 'origin/develop' into Weblate. 2020-06-30 16:02:08 +00:00
Michael Telatynski
f269aefe18
Merge pull request #4855 from matrix-org/t3chguy/download_toast 
Add Generic Expiring Toast and timing hooks
 2020-06-30 17:02:04 +01:00
Weblate
8aa80015d1 Merge branch 'origin/develop' into Weblate. 2020-06-30 15:57:02 +00:00
Michael Telatynski
446f3e35e9
Merge pull request #4846 from matrix-org/t3chguy/notifications0 
Fix Room Custom Sounds regression and make ProgressBar relevant again
 2020-06-30 16:56:57 +01:00
Weblate
1e9ad26fb9 Merge branch 'origin/develop' into Weblate. 2020-06-30 15:56:46 +00:00
random
41ac980196 Translated using Weblate (Italian) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-30 15:56:46 +00:00
Michael Albert
bf4305f00c Translated using Weblate (German) 
Currently translated at 99.9% (2343 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-30 15:56:45 +00:00
XoseM
08fa7912b3 Translated using Weblate (Galician) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-30 15:56:45 +00:00
Kévin C
2d6142d132 Translated using Weblate (French) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-30 15:56:45 +00:00
Jeff Huang
022cc5ea32 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2345 of 2345 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-30 15:56:44 +00:00
Michael Telatynski
cd06910713
Merge pull request #4854 from matrix-org/t3chguy/fix-redirect-loop 
Including start_sso and start_cas in redirect loop prevention
 2020-06-30 16:56:38 +01:00
Michael Telatynski
7d7bafb1ea De-duplicate rooms from the room autocomplete provider 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 16:23:52 +01:00
Bruno Windels
6fc4be386a add blurred, blended avatar background to left panel 2020-06-30 13:28:19 +02:00
Bruno Windels
baebab7b16 Add element theme 2020-06-30 13:28:19 +02:00
Michael Telatynski
54419878fa Add room notifications context menu and non-default indicator to RoomTile2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 00:16:51 +01:00
Michael Telatynski
adf186f568 Fix RoomTile2 Context Menu to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 23:03:44 +01:00
Weblate
34328eaf8e Merge branch 'origin/develop' into Weblate. 2020-06-29 19:10:59 +00:00
Travis Ralston
bb9ae7b55b
Merge pull request #4850 from matrix-org/travis/room-list/todo-cleanup 
Clean up TODO comments for new room list
 2020-06-29 13:10:52 -06:00
Michael Telatynski
9f6893ef2b Fix /join slash command via servers including room id as a via 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 16:27:59 +01:00
Michael Telatynski
b2b909aa53 Including start_sso and start_cas in redirect loop prevention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 15:40:20 +01:00
Weblate
8799e649df Merge branch 'origin/develop' into Weblate. 2020-06-29 11:27:30 +00:00
random
88c195e443 Translated using Weblate (Italian) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-29 11:27:30 +00:00
Michael Albert
02274ed6a6 Translated using Weblate (German) 
Currently translated at 99.9% (2342 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-29 11:27:26 +00:00
Michael Telatynski
1a1b7e5e70 Add Generic Expiring Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 11:38:50 +01:00
Michael Telatynski
51b813e250 add timing/interval/expiry hooks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 11:35:14 +01:00
Michael Telatynski
d477a49160 ToastStore fix type definition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 11:34:58 +01:00
J. Ryan Stinnett
d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp 
Show timestamp of redaction on hover
 2020-06-29 11:10:25 +01:00
Travis Ralston
175ade8ac4 Merge branch 'develop' into travis/room-list/todo-cleanup 2020-06-28 20:04:41 -06:00
Weblate
2101f14cd6 Merge branch 'origin/develop' into Weblate. 2020-06-29 02:04:28 +00:00
васян228
57df5e8f6b Translated using Weblate (Russian) 
Currently translated at 85.2% (1996 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-06-29 02:04:28 +00:00
progserega
321d8ef2a1 Translated using Weblate (Russian) 
Currently translated at 85.2% (1996 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-06-29 02:04:27 +00:00
Priit Jõerüüt
80de67eff5 Translated using Weblate (Estonian) 
Currently translated at 75.2% (1762 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-29 02:04:27 +00:00
Besnik Bleta
badce33730 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2337 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-29 02:04:25 +00:00
Travis Ralston
62467144ba Update i18n 2020-06-28 20:03:55 -06:00
Travis Ralston
ee2c216c4d Clean up TODO comments for new room list 
All relevant TODOs should still be present, and reference an issue for easy finding.
 2020-06-28 20:03:04 -06:00
Travis Ralston
753f7aa5b8 Remove the DM button from new room tiles 
Fixes https://github.com/vector-im/riot-web/issues/14221
 2020-06-27 22:48:54 -06:00
Weblate
e6de3c9149 Merge branch 'origin/develop' into Weblate. 2020-06-28 04:23:29 +00:00
Lizzy
554af62aad Translated using Weblate (Spanish) 
Currently translated at 89.0% (2087 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-06-28 04:23:28 +00:00
XoseM
11bc33853c Translated using Weblate (Galician) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-28 04:23:26 +00:00
Kévin C
c16f8aaada Translated using Weblate (French) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-28 04:23:22 +00:00
Tuomas Hietala
4acf87af0b Translated using Weblate (Finnish) 
Currently translated at 94.8% (2222 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2020-06-28 04:23:18 +00:00
Priit Jõerüüt
2f5fdd045b Translated using Weblate (Estonian) 
Currently translated at 73.8% (1731 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-28 04:23:14 +00:00
Jeff Huang
d53535c089 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2344 of 2344 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-28 04:23:06 +00:00
☕ Tim
c8381021b8 Hide room list show less button if it would do nothing 
Signed-off-by: ☕ Tim <tim@wants.coffee>

On the new rooms list, if the show less button wouldn't result in a
smaller list, don't show it.

Fixes vector-im/riot-web#14219
 2020-06-28 04:08:06 +08:00
Michael Telatynski
10492fe72f fix StyledRadioGroup React key warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-27 18:30:15 +01:00
David Baker
0579c9f748 Fix tests 2020-06-26 20:25:38 +01:00
David Baker
916f606872 Apparently we need to null check here 2020-06-26 19:07:39 +01:00
David Baker
04d660517b i18n 2020-06-26 18:58:12 +01:00
David Baker
5f2127ddf5 Disable spellcheck on the recovery key entry 2020-06-26 18:55:23 +01:00
David Baker
24baf19d65 Set field validity (ie. border colour) correctly 
Changes flagInvalid to forceValidity which can force valid as well
as invalid.
 2020-06-26 18:50:05 +01:00
David Baker
b74674ced8 Right name for security key and fix cancel button 2020-06-26 18:04:06 +01:00
Michael Telatynski
cf3c914382 Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-26 15:35:36 +01:00
David Baker
15ebaa1470 Port recovery key upload button to new designs 2020-06-26 15:22:04 +01:00
Weblate
7cd5e75d6c Merge branch 'origin/develop' into Weblate. 2020-06-26 13:33:24 +00:00
Travis Ralston
67cc84d00d Merge branch 'develop' into travis/room-list/preview-copy 2020-06-26 07:29:49 -06:00
Weblate
859c1983c7 Merge branch 'origin/develop' into Weblate. 2020-06-26 13:27:57 +00:00
Travis Ralston
3abc9d8d56 Merge branch 'develop' into travis/room-list/tag-panel 2020-06-26 07:26:57 -06:00
Weblate
6a50159298 Merge branch 'origin/develop' into Weblate. 2020-06-26 13:26:00 +00:00
XoseM
c0ad857e5c Translated using Weblate (Galician) 
Currently translated at 100.0% (2292 of 2292 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-26 13:25:59 +00:00
Travis Ralston
424443927f
Merge pull request #4843 from matrix-org/travis/room-list/user-menu 
Make the whole user row clickable in the new room list
 2020-06-26 07:25:50 -06:00
Michael Telatynski
72035c8078 Make <ProgressBar /> relevant again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 14:19:58 +01:00
Michael Telatynski
46058a17f8 Fix Room Custom Sounds regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 14:18:38 +01:00
David Baker
f4460ca78f Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2 2020-06-26 13:12:06 +01:00
David Baker
178cbca934 Use mask images in key entry dialogs 2020-06-26 12:56:41 +01:00
David Baker
919c3bd360 lint 2020-06-26 12:43:28 +01:00
David Baker
e18ea55d20 Convert icons to masks 
so they're a sensible colour in other themes
 2020-06-26 12:41:24 +01:00
David Baker
bf45cb0588 PR feedback: re-order CSS & add underscore 2020-06-26 11:24:07 +01:00
Weblate
7c6f41b3f4 Merge branch 'origin/develop' into Weblate. 2020-06-26 09:37:42 +00:00
Andrew Morgan
77b618e4f3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into anoa/new_spinner 
* 'develop' of github.com:matrix-org/matrix-react-sdk:
  bandaid
  make js-sdk import happy?
  ts-ignore because something is made of fail
  js-sdk imports suck
  Iterate on the new room list resize handle
  Welcome no longer needs any props
  unexport things which need not exporting
  Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas
  Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds
  Fix Welcome.html URLs
  improve typing
  Add account and room-account data hooks
  Create a StaticNotificationState for representative purposes
  Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
 2020-06-26 10:17:26 +01:00
Weblate
dd461bff3c Merge branch 'origin/develop' into Weblate. 2020-06-26 09:10:24 +00:00
Michael Telatynski
113dfc5ed2
Merge pull request #4845 from matrix-org/t3chguy/hf1 
ts-ignore because something is made of fail
 2020-06-26 10:10:18 +01:00
Andrew Morgan
96e4b938b2 Don't modify the size of the MessagePanel spinner 2020-06-26 09:42:44 +01:00
Michael Telatynski
a905028d3a bandaid 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:37:55 +01:00
Michael Telatynski
274e6f3825 make js-sdk import happy? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:35:29 +01:00
Andrew Morgan
228a6adfdf indentation 2020-06-26 09:27:33 +01:00
Michael Telatynski
9391d151f3 ts-ignore because something is made of fail 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:15:02 +01:00
Weblate
eb4ea114df Merge branch 'origin/develop' into Weblate. 2020-06-26 08:09:56 +00:00
aWeinzierl
b16344582a Translated using Weblate (Spanish) 
Currently translated at 89.4% (2048 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2020-06-26 08:09:56 +00:00
XoseM
2aa791d20a Translated using Weblate (Galician) 
Currently translated at 98.1% (2247 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-26 08:09:56 +00:00
Kévin C
b1b1524866 Translated using Weblate (French) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-26 08:09:49 +00:00
Michael Telatynski
538c853149
Merge pull request #4838 from matrix-org/t3chguy/hf1 
Fix Welcome.html CAS and SSO URLs not working
 2020-06-26 09:09:39 +01:00
Travis Ralston
7ce3cc1db7 Allow the tag panel to be disabled in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14156
 2020-06-25 20:35:40 -06:00
Travis Ralston
555758d3d2 Remove extra space 2020-06-25 20:23:37 -06:00
Travis Ralston
1888cda5ee Remove debug 2020-06-25 20:22:41 -06:00
Travis Ralston
588fea3a9b Make the menu show up where it was before 2020-06-25 19:55:08 -06:00
Travis Ralston
411271422c Make the whole UserMenu a button to open the menu 2020-06-25 19:54:17 -06:00
Travis Ralston
bcfdd4d984 Move all of the UserMenu into the UserMenu component 2020-06-25 19:38:11 -06:00
Travis Ralston
dafce40d1b Rename UserMenuButton to UserMenu for new scope 2020-06-25 19:29:12 -06:00
Andrew Morgan
b00d822bc0 Remove alt, use aria-label 2020-06-26 01:22:49 +01:00
Andrew Morgan
87f961df3f Put behind a labs flag 2020-06-26 01:22:46 +01:00
Andrew Morgan
6ea5dc7b7c Change the look of the spinner 2020-06-26 01:19:38 +01:00
Michael Telatynski
6116cfc2b9 js-sdk imports suck 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 23:52:32 +01:00
Weblate
150665568f Merge branch 'origin/develop' into Weblate. 2020-06-25 22:34:33 +00:00
Michael Telatynski
85c5bb3bc3
Merge pull request #4835 from matrix-org/t3chguy/notifications0 
More small tweaks in preparation for Notifications rework
 2020-06-25 23:34:28 +01:00
Weblate
dcb2bdadb6 Merge branch 'origin/develop' into Weblate. 2020-06-25 22:27:44 +00:00
Travis Ralston
30489ce819
Merge pull request #4840 from matrix-org/travis/room-list/resizer-2 
Iterate on the new room list resize handle
 2020-06-25 16:27:39 -06:00
Travis Ralston
acf56559e1 Introduce an entirely new system for handling message preview copy 
This reverts earlier changes made to textForEvent as they are no longer needed.

This also implements an entire tree of textForEvent-like behaviour as the previews need to be different, which is easiest done with its own stack.
 2020-06-25 16:26:49 -06:00
Weblate
ce809f1dac Merge branch 'origin/develop' into Weblate. 2020-06-25 22:05:31 +00:00
Travis Ralston
326fa8be7d
Merge pull request #4837 from matrix-org/travis/room-list/hover-states 
Update sublists for new hover states
 2020-06-25 16:05:25 -06:00
Travis Ralston
555078a993 Iterate on the new room list resize handle 
Only show shadow when resizing, increase the hit area, and make the handle show up when the list itself is hovered.
 2020-06-25 16:03:56 -06:00
Weblate
27417b3f65 Merge branch 'origin/develop' into Weblate. 2020-06-25 21:37:48 +00:00
Travis Ralston
7b79dd6be1 Make the sign out button red 2020-06-25 15:13:28 -06:00
Michael Telatynski
29b0505bdb Welcome no longer needs any props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 22:02:39 +01:00
Michael Telatynski
f02c52b758 unexport things which need not exporting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 22:01:41 +01:00
Michael Telatynski
c65ccbcacf Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 22:00:22 +01:00
Michael Telatynski
1c00ae8dd3 Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 21:59:46 +01:00
Michael Telatynski
3524d678f7 Fix Welcome.html URLs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 21:24:24 +01:00
Travis Ralston
0af1507eed Update sublists for new hover states 
Fixes https://github.com/vector-im/riot-web/issues/14135
Unblocks https://github.com/vector-im/riot-web/issues/14089
 2020-06-25 12:11:10 -06:00
Weblate
02d178b68e Merge branch 'origin/develop' into Weblate. 2020-06-25 16:13:57 +00:00
Travis Ralston
5efa5d2c80 Implement new resize handle for dogfooding 
Smaller handle width, small shadow on the top of the show more button if there's more rooms to be shown. The resize handle also only shows when you're hovering in the area now.

The original design called for the shadow to show up only if the user is cutting a tile or dragging, however that is complicated implementation-wise. For speed and encouraging a dogfooding pattern we're going ahead with this behaviour instead.
 2020-06-25 10:08:44 -06:00
Michael Telatynski
4885615a40 improve typing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 16:55:38 +01:00
Michael Telatynski
7da02b7901 Add account and room-account data hooks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 16:45:01 +01:00
Travis Ralston
c920cf784e Create a StaticNotificationState for representative purposes 2020-06-25 16:35:54 +01:00
Michael Telatynski
ed634a2bde Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 16:35:40 +01:00
David Baker
78f750265c Remove unused code 
No reset option here anymore
 2020-06-25 16:33:07 +01:00
Weblate
9a92a5e21e Merge branch 'origin/develop' into Weblate. 2020-06-25 14:43:56 +00:00
Michael Telatynski
7683f2fe1a
Merge pull request #4834 from matrix-org/t3chguy/notifications0 
Hide app badge count for hidden upgraded rooms (non-highlight)
 2020-06-25 15:43:50 +01:00
David Baker
648c0c28c2 Add placeholder to security phrase input 2020-06-25 15:36:06 +01:00
Michael Telatynski
61618d5162 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 15:02:52 +01:00
Weblate
c1c22c4818 Merge branch 'origin/develop' into Weblate. 2020-06-25 13:38:24 +00:00
XoseM
4b952737dc Translated using Weblate (Galician) 
Currently translated at 93.7% (2147 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:38:24 +00:00
Jorik Schellekens
a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced 
Move compact modern layout checkbox to 'advanced'
 2020-06-25 14:38:18 +01:00
Weblate
81b889783a Merge branch 'origin/develop' into Weblate. 2020-06-25 13:18:32 +00:00
XoseM
d5cf4bcfa2 Translated using Weblate (Galician) 
Currently translated at 93.7% (2146 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:18:32 +00:00
Travis Ralston
4d47dcaabd
Merge pull request #4825 from matrix-org/travis/room-list/default-lists 
Allow the user to resize the new sublists to 1 tile
 2020-06-25 07:18:26 -06:00
Weblate
c7fc4cacda Merge branch 'origin/develop' into Weblate. 2020-06-25 13:18:03 +00:00
XoseM
5045c0b135 Translated using Weblate (Galician) 
Currently translated at 93.6% (2145 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:18:03 +00:00
Travis Ralston
92f0f1a5d8
Merge pull request #4832 from matrix-org/travis/react-can-shush 
Make LoggedInView a real component because it uses shouldComponentUpdate
 2020-06-25 07:17:56 -06:00
Travis Ralston
a3b38a2b5f Make LoggedInView a real component because it uses shouldComponentUpdate 
React demands this.
 2020-06-25 07:14:02 -06:00
Weblate
149d518394 Merge branch 'origin/develop' into Weblate. 2020-06-25 13:11:39 +00:00
ziriSut
2ef2f76de9 Translated using Weblate (Kabyle) 
Currently translated at 20.1% (460 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-25 13:11:38 +00:00
Michael Albert
fa3cc28dcc Translated using Weblate (German) 
Currently translated at 99.9% (2289 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-06-25 13:11:37 +00:00
XoseM
aaff3e0bec Translated using Weblate (Galician) 
Currently translated at 92.9% (2128 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-25 13:11:36 +00:00
David Baker
29cdebb611 i18n 2020-06-25 13:26:32 +01:00
David Baker
2b144a846a Apply some of the newer styling to passphrase / recovery key entry 2020-06-25 12:44:15 +01:00
Michael Telatynski
8743af56ad Bring notification utils into this century to simplify ongoing Notifications work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 09:00:13 +01:00
Michael Telatynski
d4eebd5202 Fix alwaysShowBadgeCounts settings defn 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 08:58:54 +01:00
Michael Telatynski
edd09f66d1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-25 08:45:32 +01:00
Michael Telatynski
dbe575d523 Remove DEBUG 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 08:44:24 +01:00
Michael Telatynski
dc099efb19 make Notifier getSoundForRoom synchronous 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 08:43:35 +01:00
Weblate
2fe3780b2a Merge branch 'origin/develop' into Weblate. 2020-06-25 02:26:37 +00:00
Travis Ralston
90ff4585d5 Remove extraneous debug from the new left panel 2020-06-24 20:14:01 -06:00
Travis Ralston
37a415693f Allow the user to resize the new sublists to 1 tile 
For dogfooding https://github.com/vector-im/riot-web/issues/14137

To change the default: `localStorage.setItem("mx_dogfood_rl_defTiles", 4);`
 2020-06-24 20:08:26 -06:00
Travis Ralston
752b2acc56 Move MessagePreviewStore into the room list namespace 2020-06-24 19:51:55 -06:00
Weblate
f20b87a038 Merge branch 'origin/develop' into Weblate. 2020-06-24 16:55:20 +00:00
Travis Ralston
bb9999a414
Merge pull request #4817 from matrix-org/travis/room-list/sticky-room-fixes 
Fix sticky room disappearing/jumping in search results
 2020-06-24 10:55:14 -06:00
Travis Ralston
c047a76f1d Update the filtering for the right tag 2020-06-24 10:36:43 -06:00
Weblate
9b4b6ba785 Merge branch 'origin/develop' into Weblate. 2020-06-24 16:35:30 +00:00
J. Ryan Stinnett
767090dd78
Merge pull request #4821 from matrix-org/jryans/more-reset-paths 
Show cross-signing / secret storage reset button in more cases
 2020-06-24 17:35:24 +01:00
Weblate
ce1bcda4ac Merge branch 'origin/develop' into Weblate. 2020-06-24 16:34:52 +00:00
random
b4ab15f91f Translated using Weblate (Italian) 
Currently translated at 99.9% (2290 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-24 16:34:52 +00:00
XoseM
1aef7cdfea Translated using Weblate (Galician) 
Currently translated at 91.4% (2095 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-24 16:34:51 +00:00
Travis Ralston
906b72082e
Merge pull request #4819 from matrix-org/travis/room-list/icon-masks 
Use theme-capable icons in the user menu
 2020-06-24 10:34:29 -06:00
David Baker
ee5582ab32 Remove the "You're done" screen 2020-06-24 16:55:35 +01:00
David Baker
966837232c Add header icons & justification 2020-06-24 16:12:46 +01:00
Jorik Schellekens
0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
David Baker
a23b784e00 Enable continue button if a passphrase has been set 2020-06-24 15:21:09 +01:00
J. Ryan Stinnett
b01015f5c5 Show cross-signing / secret storage reset button in more cases 
This exposes the cross-signing / secret storage reset button in more cases to
hopefully give people a better chance of trying again in case something failed
halfway through set up. In particular, any combination of keys existing now
reveals the reset button.

Fixes https://github.com/vector-im/riot-web/issues/13993
 2020-06-24 14:30:12 +01:00
Weblate
7ee06ce975 Merge branch 'origin/develop' into Weblate. 2020-06-24 13:15:47 +00:00
Bruno Windels
fc61145c11
Merge pull request #4814 from matrix-org/bwindels/custom-theme-font 
Font support in custom themes
 2020-06-24 13:15:42 +00:00
Weblate
7518fca98b Merge branch 'origin/develop' into Weblate. 2020-06-24 13:04:57 +00:00
Bruno Windels
183eb78fa8 fix lint 2020-06-24 14:58:41 +02:00
Bruno Windels
b3fd1eda03 change the format of font faces to something closer to the css 2020-06-24 14:54:14 +02:00
David Baker
bf15e96a6a Make pasphrase screen look more like designs 
Although passphrase / passphrase confirm is still split between two
screens because that's more work to change and probably is not a pivotal
part of the UI that needs to change in step with everything else.
 2020-06-24 12:43:56 +01:00
ziriSut
bced934613 Translated using Weblate (Kabyle) 
Currently translated at 19.6% (449 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-24 10:00:19 +00:00
Szimszon
354e31e7db Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-24 10:00:19 +00:00
XoseM
f1fc81be69 Translated using Weblate (Galician) 
Currently translated at 84.8% (1943 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-24 10:00:18 +00:00
Kévin C
7cb48aac9b Translated using Weblate (French) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-24 10:00:17 +00:00
Jeff Huang
bf34d37606 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-24 10:00:16 +00:00
Slavi Pantaleev
dd8109f77a Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (2291 of 2291 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-06-24 10:00:16 +00:00
Travis Ralston
5c7e59b132 Use theme-capable icons in the user menu 
They're still inconsistent weights, but at least they are the right color on non-light-theme clients.
 2020-06-23 21:17:39 -06:00
Travis Ralston
380aed4244 Update profile information in User Menu 
Fixes https://github.com/vector-im/riot-web/issues/14158 (we needed an HTTP avatar URL)
Fixes https://github.com/vector-im/riot-web/issues/14159
Fixes https://github.com/vector-im/riot-web/issues/14157
Also fixes an issue where it wasn't updating automatically when the user changed their profile info.

This is all achieved through a new OwnProfileStore which does the heavy lifting, as we have to keep at least 2 components updated.
 2020-06-23 21:01:50 -06:00
Travis Ralston
f93d67fc65 Fix sticky room disappearing/jumping in search results 
Fixes https://github.com/vector-im/riot-web/issues/14124
Fixes https://github.com/vector-im/riot-web/issues/14154 (which was technically supposed to say that the sticky room when filtering was always last)

This is all a bit complicated, but the theory is that we end up with a stable list even through filtering. There's some notes within, though I suspect it'll be difficult to understand :(
 2020-06-23 16:49:39 -06:00
Weblate
001abf40fb Merge branch 'origin/develop' into Weblate. 2020-06-23 19:38:12 +00:00
XoseM
a915da650a Translated using Weblate (Galician) 
Currently translated at 84.0% (1924 of 2290 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-23 19:38:12 +00:00
Besnik Bleta
cc60fff198 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2288 of 2290 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-06-23 19:38:09 +00:00
Hubert Chathi
74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup 
Mark messages with a black shield if the megolm session isn't trusted
 2020-06-23 15:38:03 -04:00
Bruno Windels
3b13a623cd cleanup 2020-06-23 17:54:57 +02:00
Bruno Windels
2f6fc6bba2 allow adding custom font faces in theme 2020-06-23 17:54:38 +02:00
Bruno Windels
b3510aa2b4 remove css vars when switching theme 2020-06-23 17:54:17 +02:00
Bruno Windels
e083856801 allow changing the font-family 2020-06-23 17:53:40 +02:00
Bruno Windels
86597aabca better naming 2020-06-23 17:52:54 +02:00
David Baker
3716f9d82c Fix cancel button / prompt 2020-06-23 16:43:52 +01:00
David Baker
0694776b25 Update the 'save your security key' screen 2020-06-23 16:27:41 +01:00
Weblate
edc384ac92 Merge branch 'origin/develop' into Weblate. 2020-06-23 14:38:55 +00:00
Jorik Schellekens
1e39279a77
Merge pull request #4761 from matrix-org/joriks/appearance-advanced 
Custom font selection
 2020-06-23 15:38:50 +01:00
Weblate
da308da6ac Merge branch 'origin/develop' into Weblate. 2020-06-23 14:24:14 +00:00
J. Ryan Stinnett
3829362754 Fix up merge to develop 2020-06-23 15:24:02 +01:00
Weblate
4c33d8d38f Merge branch 'origin/develop' into Weblate. 2020-06-23 14:20:32 +00:00
ziriSut
84bcd98d17 Translated using Weblate (Kabyle) 
Currently translated at 19.6% (449 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/kab/
 2020-06-23 14:20:32 +00:00
random
6255c67d4f Translated using Weblate (Italian) 
Currently translated at 99.9% (2287 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-23 14:20:26 +00:00
Kévin C
c5da3d726d Translated using Weblate (French) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-23 14:20:25 +00:00
Priit Jõerüüt
876e7799ba Translated using Weblate (Estonian) 
Currently translated at 70.2% (1606 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-06-23 14:20:25 +00:00
Jeff Huang
07cbf23b22 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2288 of 2288 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-23 14:20:20 +00:00
RiotRobot
6161f95434 Merge branch 'master' into develop 2020-06-23 15:18:35 +01:00
David Baker
6ce8584337 Implement first screen (recovery key / passphrase choice) 2020-06-23 15:04:39 +01:00
Jorik Schellekens
680e997a94 Cleanup tooltip classnames 2020-06-23 13:38:50 +01:00
Weblate
b3a5093e4b Merge branch 'origin/develop' into Weblate. 2020-06-22 22:16:20 +00:00
ziriSut
22269de5b0 Translated using Weblate (Kabyle) 
Currently translated at 9.7% (223 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 22:16:20 +00: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
Weblate
8d7497f426 Merge branch 'origin/develop' into Weblate. 2020-06-22 21:16:59 +00: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
Weblate
9ed1a96209 Merge branch 'origin/develop' into Weblate. 2020-06-22 20:58:51 +00: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
Weblate
d31266cc22 Merge branch 'origin/develop' into Weblate. 2020-06-22 20:16:29 +00: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
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
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
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
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
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
David Baker
ee6af6ae9e Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:17:18 +01:00
David Baker
a1592704a2 Unused code & import 2020-06-19 17:17:04 +01:00
Weblate
3b75eb173c Merge branch 'origin/develop' into Weblate. 2020-06-19 16:06:15 +00:00
random
a1cb070c60 Translated using Weblate (Italian) 
Currently translated at 99.9% (2281 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-06-19 16:06:15 +00:00
Szimszon
e4521a4d81 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-06-19 16:06:15 +00:00
XoseM
db14729489 Translated using Weblate (Galician) 
Currently translated at 79.8% (1822 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2020-06-19 16:06:14 +00:00
Kévin C
4948e49f76 Translated using Weblate (French) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-06-19 16:06:09 +00:00
David Baker
87ab0f9830
Merge pull request #4762 from matrix-org/dbkr/fix_verification_race 
Look for existing verification requests after login
 2020-06-19 17:06:02 +01:00
David Baker
3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
Weblate
4e92472f73 Merge branch 'origin/develop' into Weblate. 2020-06-19 08:48:50 +00:00
Victor Grousset
c7f72f0d00 Translated using Weblate (Esperanto) 
Currently translated at 98.7% (2252 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-06-19 08:48:49 +00:00
Jeff Huang
95dadca8e8 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2282 of 2282 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-06-19 08:48:49 +00:00
Damir Jelić
e3ae05b6b9 Merge branch 'poljar/eventindex-user-version' into develop 2020-06-19 09:50:40 +02:00
Damir Jelić
253212d8c8 Merge remote-tracking branch 'origin/poljar/eventindex-new-encrypted-rooom' into develop 2020-06-19 09:50:22 +02:00
Damir Jelić
ec4b350a82 Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop 2020-06-19 09:50:03 +02:00
Hubert Chathi
c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Weblate
8b0bc522da Merge branch 'origin/develop' into Weblate. 2020-06-18 22:53:47 +00:00
Travis Ralston
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
Weblate
ff7d1a0034 Merge branch 'origin/develop' into Weblate. 2020-06-18 22:20:18 +00:00
Michael Telatynski
e723d6115c
Merge pull request #4795 from matrix-org/t3chguy/hide_unknown_rooms_search 
hide search results from unknown rooms
 2020-06-18 23:20:12 +01:00
Weblate
6112018401 Merge branch 'origin/develop' into Weblate. 2020-06-18 21:59:47 +00:00
Travis Ralston
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
Michael Telatynski
3ac028565b i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:50:10 +01:00
Michael Telatynski
eec42cff49 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:49:39 +01:00
Travis Ralston
847f12c289 Update i18n 2020-06-18 15:47:30 -06:00
Travis Ralston
0e9ef8804d Mark the new room list as ready for general testing 2020-06-18 15:46:37 -06:00
Michael Telatynski
045def4566 hide search results from unknown rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:45:42 +01:00
Weblate
712f10c76d Merge branch 'origin/develop' into Weblate. 2020-06-18 18:36:48 +00:00
vicdorke
a09779063c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 60.5% (1382 of 2283 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2020-06-18 18:36:48 +00:00
Michael Telatynski
69c5aecfc7
Merge pull request #4784 from bocoup/extend-querymatcher-heuristic 
Extend QueryMatcher's sorting heuristic
 2020-06-18 19:36:42 +01:00
Mike Pennisi
2e0cb4746a fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 14:20:40 -04:00
Mike Pennisi
4ffc54d143 fixup! Extend QueryMatcher's sorting heuristic 2020-06-18 13:24:02 -04:00
Jorik Schellekens
37b299412f Fix merge conflicts 2020-06-18 15:47:26 +01:00
Jorik Schellekens
f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00
Jorik Schellekens
b9fb9aae4a Rename MessagePreview to EventTilePreview 2020-06-18 15:36:23 +01:00
Jorik Schellekens
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
Jorik Schellekens
997c7ffc96 Add missing semicolons 2020-06-18 15:26:53 +01:00
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +01:00
Jorik Schellekens
adfe1ac9bf Remove stray debug 2020-06-18 15:13:28 +01:00
David Baker
9b9e6e04e3 Merge remote-tracking branch 'origin/develop' into dbkr/fix_verification_race 2020-06-18 15:12:06 +01:00
Weblate
f6e55345a1 Merge branch 'origin/develop' into Weblate. 2020-06-18 14:08:30 +00:00
David Baker
e4d824839a Revert "Use recovery keys over passphrases" 2020-06-18 15:02:03 +01:00
Jorik Schellekens
ba0bc8f29c Resolve "The Great Conflict" 2020-06-18 14:55:24 +01:00
Jorik Schellekens
291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
Jorik Schellekens
74174041bb Remove semicolon in style 2020-06-18 14:53:12 +01:00
Weblate
199f776e58 Merge branch 'origin/develop' into Weblate. 2020-06-18 13:51:27 +00:00
David Baker
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