Commit graph

20243 commits

Author SHA1 Message Date
Travis Ralston
b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-05 08:39:19 -06:00
MamasLT
0a1080de5a Translated using Weblate (Lithuanian)
Currently translated at 67.4% (1522 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-06-05 10:03:09 +00:00
Travis Ralston
1f11298aa3 Annotate hacky math 2020-06-04 21:45:32 -06:00
Travis Ralston
e90e70bd77 Misc cleanup 2020-06-04 21:43:33 -06:00
Travis Ralston
0694637b06 Remove debug 2020-06-04 21:38:06 -06:00
Travis Ralston
f347019cf8 Remove obviously questionable color choices 2020-06-04 21:37:10 -06:00
Travis Ralston
0c15b2bdb6 Simple structuring of the room list itself
This covers the larger parts of the design, but doesn't deal with the nuances of hover states, badge sizing, etc.
2020-06-04 21:21:04 -06:00
Travis Ralston
4c1bc50649 Initial styling for new room list
This is a work in progress, but covers the coarse areas. This uses all-new classes to better describe what everything is, and to reduce the number of selectors we keep track of.

This is primarily layout for the list and not actually the final structure. For example, some buttons are missing and other areas are not styled correctly - the idea in this commit was to get things roughly in the right place and work on it.
2020-06-04 16:41:18 -06:00
Travis Ralston
02c131e3ff Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-04 16:40:55 -06:00
Travis Ralston
434f6ea4d4 Remove legacy sublist sizing 2020-06-04 16:36:14 -06:00
Travis Ralston
dc01607ad9 Merge branch 'develop' into travis/split-left-panel 2020-06-04 15:09:51 -06:00
Weblate
6fd24e837c Merge branch 'origin/develop' into Weblate. 2020-06-04 21:07:24 +00:00
Matthew Hodgson
02cdc8a201
Merge pull request #4710 from matrix-org/matthew/fix-safari-emoji
fix emoji in safari
2020-06-04 22:07:18 +01:00
Matthew Hodgson
c171bdfec7 fix emoji in safari
1. emoji sometimes vanished from the autocompleter due to a rounding error
   combined with maxWidth: 1em on the emoji span kicking in at arbitrary
   font sizes/zooms
2. apparently safari needs explicit VS-16 ligatures, as per
   ff7dec427f
2020-06-04 22:01:16 +01:00
Weblate
2bf74c0229 Merge branch 'origin/develop' into Weblate. 2020-06-04 20:12:26 +00:00
Travis Ralston
dc23dd637c Revert "Add a warning for dismissing invalid toasts"
This reverts commit 3674b6446e.
2020-06-04 14:07:06 -06:00
Travis Ralston
3674b6446e Add a warning for dismissing invalid toasts 2020-06-04 13:53:09 -06:00
Travis Ralston
c667ea69af Fix not being able to dismiss new login toasts
`toastKey` is a thing.

Fixes https://github.com/vector-im/riot-web/issues/13923
2020-06-04 13:48:35 -06:00
Jorik Schellekens
f3011f00f7
Remove debug 2020-06-04 19:43:35 +01:00
Weblate
f72e331d99 Merge branch 'origin/develop' into Weblate. 2020-06-04 18:30:01 +00:00
Jorik Schellekens
bba6767608 Update displayed min and max 2020-06-04 18:00:22 +01:00
David Baker
5e569d75b6 Fix exceptions from Tooltip
renderTooltip was not a bound function and so was failing to find
the parent when called from the 'scroll' event listener because
'this' was the window object rather than the Tooltip object.

Unsure at what point this broke - I assumed it was in thr recent
typescript conversion but it looks like it would have had the same
problem before.
2020-06-04 17:54:18 +01:00
Jorik Schellekens
2ec47ecc74 Use different setting flag print expected values 2020-06-04 17:50:56 +01:00
Weblate
73ba31a438 Merge branch 'origin/develop' into Weblate. 2020-06-04 16:41:21 +00:00
Tulir Asokan
46b282142f
Stop removing variation selector from quick reactions
Fixes vector-im/riot-web#13926

Signed-off-by: Tulir Asokan <tulir@maunium.net>
2020-06-04 18:58:13 +03:00
Travis Ralston
a3fdd643d7 Add hacky math support 2020-06-04 09:57:16 -06:00
Jorik Schellekens
f6504d67ba Use 10px instead 2020-06-04 16:23:28 +01:00
Travis Ralston
cdf2d70aea Merge branch 'develop' into travis/room-list/scrolling-resize 2020-06-04 09:19:54 -06:00
Travis Ralston
83df79aab9 Try variable resizing 2020-06-04 09:19:03 -06:00
XoseM
47df8f2ac0 Translated using Weblate (Galician)
Currently translated at 53.5% (1208 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-04 14:14:07 +00:00
Weblate
648167ffdd Merge branch 'origin/develop' into Weblate. 2020-06-04 12:59:19 +00:00
XoseM
82eb80f0c6 Translated using Weblate (Galician)
Currently translated at 52.7% (1189 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-04 12:59:19 +00:00
Michael Telatynski
920e087ada
Merge pull request #4704 from matrix-org/t3chguy/continuation
Tidy up continuation algorithm and make it work for hidden profile changes
2020-06-04 13:59:13 +01:00
Weblate
deac4222fb Merge branch 'origin/develop' into Weblate. 2020-06-04 12:50:20 +00:00
Michael Telatynski
4043989a25
Merge pull request #4699 from matrix-org/t3chguy/fix-own-displayname
Profile settings should never show a disambiguated display name
2020-06-04 13:50:15 +01:00
Michael Telatynski
6d81337d92 Tidy up continuation algorithm and make it work for hidden profile change events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 13:10:45 +01:00
Weblate
0c7fc87fa8 Merge branch 'origin/develop' into Weblate. 2020-06-04 12:07:24 +00:00
Bruno Windels
07e0cab4a8 When trying to restore a keyback that has its key in 4S, check if 4S will be readable
If the account data for the 4S key is cleared or lost somehow, don't attempt to
read the key and ask for the passphrase/recovery key instead, as doing so would trigger another
bootstrap from the restore key backup dialog, overwriting the existing key backup.
2020-06-04 12:52:20 +02:00
random
9c93e48748 Translated using Weblate (Italian)
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-06-04 09:16:51 +00:00
Kévin C
db6d60566b Translated using Weblate (French)
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-06-04 09:16:51 +00:00
Jeff Huang
39dcc9f23c Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2258 of 2258 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-06-04 09:16:50 +00:00
Michael Telatynski
993a545cd2 Profile settings should never show a disambiguated display name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 09:50:19 +01:00
Travis Ralston
30027a6556 Remove debugging 2020-06-03 21:53:58 -06:00
Travis Ralston
be4f75bca9 Add a 'show more' button to room lists 2020-06-03 21:53:08 -06:00
Travis Ralston
dbf996439b Wedge t3chguy's resizer prototype into the sublist 2020-06-03 21:17:51 -06:00
Travis Ralston
c07b5ebe9a Initial experiments with resizing of room lists 2020-06-03 21:17:18 -06:00
Weblate
3f75d82d95 Merge branch 'origin/develop' into Weblate. 2020-06-03 23:36:27 +00:00
Michael Telatynski
bde327e1e6
Merge pull request #4695 from aaronraimist/center-headerbuttons
Center HeaderButtons
2020-06-04 00:36:23 +01:00
Aaron Raimist
ed2eca52b2
Don't show FormatBar if composer is empty
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 18:05:43 -05:00
Aaron Raimist
a4c9a67325 Delete files.png and change UploadConfirmDialog to use svg used elsewhere
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-06-03 17:23:37 -05:00
Weblate
bfb1dc2938 Merge branch 'origin/develop' into Weblate. 2020-06-03 21:12:19 +00:00
Michael Telatynski
eccacb1bc7
Merge pull request #4605 from matrix-org/t3chguy/e2eedefault
Add .well-known option to control default e2ee behaviour
2020-06-03 22:12:13 +01:00
Weblate
bfff565eae Merge branch 'origin/develop' into Weblate. 2020-06-03 19:28:06 +00:00
Michael Telatynski
10bdb4975e
Merge pull request #4685 from matrix-org/t3chguy/sso-query
Fix login loop where the sso flow returns to `#/login`
2020-06-03 20:28:01 +01:00
Weblate
3f028725ec Merge branch 'origin/develop' into Weblate. 2020-06-03 19:23:30 +00:00
Michael Telatynski
5b775fd63c
Merge pull request #4690 from matrix-org/t3chguy/mau-toasts
Don't clear MAU toasts when a successful sync comes in
2020-06-03 20:23:25 +01:00
Michael Telatynski
899f9ede45 change names of consts for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 20:23:01 +01:00
Weblate
9898532b49 Merge branch 'origin/develop' into Weblate. 2020-06-03 19:21:19 +00:00
Travis Ralston
380ba163e4
Merge pull request #4681 from matrix-org/travis/room-list/filtering
Add initial filtering support to new room list
2020-06-03 13:21:13 -06:00
Michael Telatynski
5a4723d243 don't specify hs_disabled as its a Synapse special
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 20:13:32 +01:00
Travis Ralston
bc2fbefb5c Remove iteratorToArray 2020-06-03 11:29:06 -06:00
Weblate
abbcc316ed Merge branch 'origin/develop' into Weblate. 2020-06-03 16:10:11 +00:00
Travis Ralston
013751e308
Merge pull request #4664 from matrix-org/foldleft/13523-hide-empty-verifications
Bubble up a decline-to-render of verification events to outside wrapper
2020-06-03 10:10:06 -06:00
Tirifto
520bb1e6fa Translated using Weblate (Esperanto)
Currently translated at 100.0% (2257 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-06-03 16:09:39 +00:00
Michael Telatynski
9c417cfbad Don't clear MAU toasts when a successful sync comes in
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 16:17:31 +01:00
Weblate
9864e5d783 Merge branch 'origin/develop' into Weblate. 2020-06-03 14:37:25 +00:00
Michael Telatynski
030cc5cdea
Merge pull request #4666 from matrix-org/t3chguy/image-view-focuslock
Apply FocusLock to ImageView to capture Escape handling
2020-06-03 15:37:18 +01:00
Weblate
b381b3825b Merge branch 'origin/develop' into Weblate. 2020-06-03 13:44:13 +00:00
random
003e75968a Translated using Weblate (Italian)
Currently translated at 100.0% (2257 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-06-03 13:44:13 +00:00
Priit Jõerüüt
677c7aac45 Translated using Weblate (Estonian)
Currently translated at 57.8% (1304 of 2257 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-06-03 13:44:13 +00:00
David Baker
ddcd3fb806 Fix the 'complete security' screen
https://github.com/matrix-org/matrix-react-sdk/pull/4655 removed
the check for cross-signing account data where the cross-signing
labs flag was enabled if you had an existing cross-signing setup.
This also sent the user to the 'complete security' view rather than
the 'E2E Setup' view though, which meant new logins should always
see the E2E setup screen (ie. be prompted to upgrade encryption).

NB. We need to change this check for SSSS keys in account data
(https://github.com/vector-im/riot-web/issues/13894) but we should
put this back the way it was in the meantime.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4655
2020-06-03 14:31:34 +01:00
Michael Telatynski
d92f742205 Fix Jitsi wellknown hooks some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 14:09:45 +01:00
Michael Telatynski
a674131a8c Fix Jitsi wellknown hooks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 13:58:17 +01:00
Michael Telatynski
5156388fc6 Change well known poll period to 2 hours to match existing Jitsi poll
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 12:25:57 +01:00
David Baker
226abb457e Update copy in encryption upgrade swcreen 2020-06-03 12:24:22 +01:00
David Baker
6f3bfc96ca Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-03 11:01:43 +01:00
Weblate
b51fbfd0c8 Merge branch 'origin/develop' into Weblate. 2020-06-03 09:59:19 +00:00
Michael Telatynski
6d11b4f99b
Merge pull request #4688 from matrix-org/t3chguy/autocomplete-scrollintoview
add null-guard for Autocomplete containerRef
2020-06-03 10:59:14 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
2020-06-03 10:51:17 +01:00
Weblate
bde8cc7bd6 Merge branch 'origin/develop' into Weblate. 2020-06-03 09:45:52 +00:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
2020-06-03 10:45:47 +01:00
Weblate
38be84e677 Merge branch 'origin/develop' into Weblate. 2020-06-03 09:42:24 +00:00
Kévin C
89c33b2c38 Translated using Weblate (French)
Currently translated at 100.0% (2303 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-06-03 09:42:24 +00:00
Priit Jõerüüt
a165066d19 Translated using Weblate (Estonian)
Currently translated at 57.3% (1320 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
2020-06-03 09:42:24 +00:00
Jeff Huang
d33cd5d6f8 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2303 of 2303 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-06-03 09:42:19 +00:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing
Remove feature_cross_signing
2020-06-03 10:42:13 +01:00
Michael Telatynski
b120488857 add null-guard for Autocomplete containerRef
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-03 10:39:28 +01:00
David Baker
5844a2dd9b indenting (that somehow the linter doesn't care about?) 2020-06-03 10:09:38 +01:00
David Baker
b60a1d3b66 Import components 2020-06-03 09:55:48 +01:00
Michael Telatynski
7cfeda96d0
Merge pull request #4670 from matrix-org/t3chguy/autocomplete-scrollintoview
Autocomplete: use scrollIntoView for auto-scroll to fix it
2020-06-03 09:55:00 +01:00
Travis Ralston
6d96d66c03 Split the left panel into new and old for new room list designs
Though we consider the "room list" to mean the RoomList component specifically, the room list is actually the entire left panel as far as the user is concerned. 

The new proposed designs for the room list modify the whole left panel, so we had might as well break it into new and old now instead of later. This "new" left panel is a bare-bones implementation and meant to only provide the absolute basic feature set to function for those who enable the experimental room list, for whatever reason. This is not intended to be a final implementation, or even remotely close to what it could be. An example of this is the lack of breadcrumbs. Given they are likely to change, they are excluded from this temporary skeleton completely.

This also includes a purple/pink bar between the tag panel and left panel. This is so we can, if needed, differentiate between people who made the mistake of turning on the experimental room list while the overall aesthetic makes it indistinguishable. Once the designs are moderately approved, we can (and definitely should) remove the hideous indicator.
2020-06-02 19:26:07 -06:00
Travis Ralston
1f1f613777 Add a focus_composer dispatcher action
and use it
2020-06-02 19:07:46 -06:00
Michael Telatynski
d99babfe05 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-02 21:51:05 +01:00
Michael Telatynski
48c535e578 hide setup encryption toasts on an e2ee-default:false config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-02 21:40:32 +01:00
David Baker
b83ecb1781 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-02 18:53:54 +01:00
David Baker
0046e204a0 Make the continue button actually work 2020-06-02 18:30:37 +01:00
David Baker
397b95c5fa lint 2020-06-02 18:03:32 +01:00
David Baker
5624cf5ceb Add option to reset keys to the encryption setup screen 2020-06-02 17:55:27 +01:00
Jorik Schellekens
c0ac44e471 Change internal font size from from 15 to 20. 2020-06-02 17:10:22 +01:00
David Baker
e06ba2003b Prompt for recovery key on login rather than passphrase
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
2020-06-02 16:32:15 +01:00
Michael Telatynski
113a9d71b5 Fix login loop where the sso flow returns to #/login
due to fragmentAfterLogin going back to `#/login`
and https://github.com/vector-im/riot-web/issues/11643

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-02 16:26:07 +01:00
Michael Telatynski
3fbfb62bc9 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 2020-06-02 14:00:37 +01:00
Michael Telatynski
ef1d682683 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-02 13:51:58 +01:00
Michael Telatynski
3020e395c1 iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-02 13:48:08 +01:00
LinAGKar
8672e4849e Translated using Weblate (Swedish)
Currently translated at 64.4% (1482 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2020-06-02 12:29:56 +00:00
Weblate
9b975820a3 Merge branch 'origin/develop' into Weblate. 2020-06-02 09:14:19 +00:00
XoseM
833732e732 Translated using Weblate (Galician)
Currently translated at 52.3% (1204 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-06-02 09:14:19 +00:00
Slavi Pantaleev
2794bf3c00 Translated using Weblate (Bulgarian)
Currently translated at 95.6% (2201 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2020-06-02 09:14:18 +00:00
J. Ryan Stinnett
0717c7749e
Merge pull request #4347 from MTRNord/fix-register-auth-with-new-spec
Make auth argument in the register request compliant with r0.6.0
2020-06-02 10:14:09 +01:00
Weblate
945ebfc45c Merge branch 'origin/develop' into Weblate. 2020-06-02 06:22:20 +00:00
Travis Ralston
613b994f9d
Revert "Prevent PersistedElements overflowing scrolled areas" 2020-06-02 00:21:31 -06:00
Travis Ralston
73a8e77d32 Add initial filtering support to new room list
For https://github.com/vector-im/riot-web/issues/13635

This is an incomplete implementation and is mostly dumped in this state for review purposes. The remainder of the features/bugs are expected to be in more bite-sized chunks.

This exposes the RoomListStore on the window for easy access to things like the new filter functions (used in debugging).

This also adds initial handling of "new rooms" to the client, though the support is poor.

Known bugs:
* [ ] Regenerates the entire room list when a new room is seen.
* [ ] Doesn't handle 2+ filters at the same time very well (see gif. will need a priority/ordering of some sort).
* [ ] Doesn't handle room order changes within a tag yet, despite the docs implying it does.
2020-06-01 16:49:22 -06:00
Michael Telatynski
5025de5525 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-01 23:28:21 +01:00
Michael Telatynski
d3523afd29 delint scss and i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:11:47 +01:00
Michael Telatynski
2dda93bf1a delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:09:57 +01:00
Michael Telatynski
702bbe3bcd Add e2ee-default:false notice to Setting>Security
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 23:09:14 +01:00
Michael Telatynski
a2fb96eb8f Update Create Room Dialog microcopy for e2ee-default:false
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 22:59:14 +01:00
Michael Telatynski
366c60cb2d fix ee listener add
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 22:57:51 +01:00
Weblate
42a3dda39d Merge branch 'origin/develop' into Weblate. 2020-06-01 21:44:10 +00:00
Travis Ralston
4dda573527 i18n 2020-06-01 15:43:29 -06:00
Travis Ralston
5b6118dad4 Remove the unused GroupsButton too 2020-06-01 15:39:22 -06:00
Michael Telatynski
3f72a590f5 move e2ee-default switch to well-known from config.json
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 22:37:12 +01:00
Michael Telatynski
cbc2aee746 Add js-sdk mechanism for polling client well-known for config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 22:35:16 +01:00
Travis Ralston
ad617f9e3a Remove unused TagPanelButtons
This isn't used, and is just confusing. The feedback dialog is still used by the top left menu.
2020-06-01 15:35:08 -06:00
Weblate
f2b33f7577 Merge branch 'origin/develop' into Weblate. 2020-06-01 21:00:56 +00:00
Jorik Schellekens
c66a277409
Merge pull request #4679 from JorikSchellekens/joriks/fix-irc-resize-save
Pass roomId to IRCTimelineProfileResizer
2020-06-01 22:00:51 +01:00
Michael Telatynski
8848a2ea64 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
 Conflicts:
	src/components/views/dialogs/InviteDialog.js
2020-06-01 21:42:31 +01:00
Jorik Schellekens
5bba62c28b Pass roomId to IRCTimelineProfileResizer 2020-06-01 18:27:10 +01:00
Weblate
0d075fc8ad Merge branch 'origin/develop' into Weblate. 2020-06-01 17:22:27 +00:00
Jorik Schellekens
5caae2051b
Merge pull request #4678 from JorikSchellekens/joriks/draggable-cleanup-console
Remove logging to console for irc name resize
2020-06-01 18:22:23 +01:00
Weblate
0b95080356 Merge branch 'origin/develop' into Weblate. 2020-06-01 17:12:09 +00:00
Jorik Schellekens
85faa8ac23
Merge pull request #4677 from JorikSchellekens/joriks/fix-dark-theme-selection
Use arrow functions instead of binding `this`
2020-06-01 18:12:05 +01:00
Jorik Schellekens
6801751745 No logging 2020-06-01 18:08:52 +01:00
Jorik Schellekens
7db95b614a Revert to arrow functions to bind this 2020-06-01 18:01:12 +01:00
Weblate
70423178de Merge branch 'origin/develop' into Weblate. 2020-06-01 16:58:08 +00:00
Jorik Schellekens
8fea9e831e
Merge pull request #4665 from JorikSchellekens/joriks/appearance-tab
Create and use stylised checkboxes
2020-06-01 17:58:03 +01:00
Weblate
bcf732b763 Merge branch 'origin/develop' into Weblate. 2020-06-01 16:57:47 +00:00
Jorik Schellekens
c1adee376f
Merge pull request #4676 from JorikSchellekens/joriks/fix-irc-resizer
useIRCLayout moved to props
2020-06-01 17:57:43 +01:00
Jorik Schellekens
df18638164 useIRCLayout moved to props 2020-06-01 17:34:42 +01:00
Weblate
24234c9d9c Merge branch 'origin/develop' into Weblate. 2020-06-01 16:25:49 +00:00
Nils J. Haugen
7d0ccabe6c Translated using Weblate (Norwegian Nynorsk)
Currently translated at 55.6% (1279 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nn/
2020-06-01 16:25:48 +00:00
random
a57ef5c170 Translated using Weblate (Italian)
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-06-01 16:25:48 +00:00
notramo
d19c5b8400 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-06-01 16:25:48 +00:00
Tuomas Hietala
858b52cd85 Translated using Weblate (Finnish)
Currently translated at 95.7% (2204 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2020-06-01 16:25:48 +00:00
Michael Telatynski
19e8fa01f2 use import instead of getComponent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 17:05:53 +01:00
Jorik Schellekens
53129cafc7 Move comment 2020-06-01 15:36:55 +01:00
Jorik Schellekens
fb9b14ec51 Remove superflous list 2020-06-01 15:35:25 +01:00
Michael Telatynski
7b2f2daf2c Upload and Paste to Upload tweaks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-01 15:00:55 +01:00
Jorik Schellekens
69747b6114 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab 2020-06-01 14:32:31 +01:00
Jorik Schellekens
9e9bcb4974 Move id generator into constrcutor 2020-06-01 12:04:47 +01:00
Weblate
044010adb7 Merge branch 'origin/develop' into Weblate. 2020-05-31 20:17:29 +00:00
notramo
610c35e8cc Translated using Weblate (Hungarian)
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-05-31 20:17:28 +00:00
Szimszon
179da0132b Translated using Weblate (Hungarian)
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-05-31 20:17:27 +00:00
XoseM
609e35b5ea Translated using Weblate (Galician)
Currently translated at 51.9% (1195 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-05-31 20:17:25 +00:00
Kévin C
fc638ffc3e Translated using Weblate (French)
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-31 20:17:22 +00:00
Tirifto
7c290b4b5d Translated using Weblate (Esperanto)
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-05-31 20:17:22 +00:00
Stanislav Lukeš
5da9c414e3 Translated using Weblate (Czech)
Currently translated at 94.4% (2172 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2020-05-31 20:17:21 +00:00
Jeff Huang
cf465a4595 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-31 20:17:20 +00:00
Besnik Bleta
dff352081b Translated using Weblate (Albanian)
Currently translated at 99.9% (2299 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-05-31 20:17:20 +00:00
Jorik Schellekens
419857c29c
Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression
Fix FilePanel and NotificationsPanel regression
2020-05-31 21:17:14 +01:00
Michael Telatynski
66a945b26c Merge branches 'develop' and 't3chguy/autocomplete-scrollintoview' of github.com:matrix-org/matrix-react-sdk into t3chguy/autocomplete-scrollintoview 2020-05-30 13:41:00 +01:00
Michael Telatynski
bc83984a62 tidy up the ref to ref with a forwardRef and initialComponent signature
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-30 13:30:59 +01:00
Weblate
ed93b13741 Merge branch 'origin/develop' into Weblate. 2020-05-30 11:54:47 +00:00
Michael Telatynski
6472ca451e
Merge pull request #4669 from matrix-org/t3chguy/toasts6_1
Allow deferring of Update Toast until the next morning
2020-05-30 12:54:42 +01:00
Weblate
f7bbc0c337 Merge branch 'origin/develop' into Weblate. 2020-05-30 11:46:59 +00:00
Jeff Huang
111a656ab6 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2301 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-30 11:46:59 +00:00
Michael Telatynski
097f27c822
Merge pull request #4668 from matrix-org/t3chguy/toasts6
Give contextual feedback for manual update check instead of banner
2020-05-30 12:46:53 +01:00
Michael Telatynski
8087b521e6 Autocomplete: use scrollIntoView for auto-scroll instead of broken manual scrollTop calculation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 21:42:33 +01:00
Michael Telatynski
0bbf971bac
Update src/dispatcher/actions.ts
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-05-29 20:50:47 +01:00
Weblate
4346207811 Merge branch 'origin/develop' into Weblate. 2020-05-29 19:47:36 +00:00
Michael Telatynski
3f76b73b50
Merge pull request #4659 from matrix-org/t3chguy/dialog_cancel_space
Dialog wrap title instead of taking same space as the close/cancel button
2020-05-29 20:47:31 +01:00
Weblate
0e6b2b1b87 Merge branch 'origin/develop' into Weblate. 2020-05-29 19:16:19 +00:00
MamasLT
f0f8051ef3 Translated using Weblate (Lithuanian)
Currently translated at 66.1% (1520 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-29 19:16:19 +00:00
Michael Telatynski
0b44e30517
Merge pull request #4627 from matrix-org/t3chguy/modular-utm
Update Modular hosting link
2020-05-29 20:16:13 +01:00
Michael Telatynski
9431393bda Allow deferring of Update Toast until the next morning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 19:59:47 +01:00
Jorik Schellekens
b61f1704d3
Merge branch 'develop' into joriks/fix-filepanel-regression 2020-05-29 19:14:19 +01:00
Michael Telatynski
f45c584c8a Correct the GenericToast props to show the two modes of operation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 19:13:59 +01:00
Michael Telatynski
efd0da44a1 Give contextual feedback for manual update check instead of banner
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 18:24:45 +01:00
Weblate
3a4f0a43d5 Merge branch 'origin/develop' into Weblate. 2020-05-29 16:47:09 +00:00
Travis Ralston
822a126cb6
Merge pull request #4663 from JorikSchellekens/develop
Fix field placeholder regression
2020-05-29 10:47:04 -06:00
David Baker
631184c661 Fix upgrading with already trusted backup 2020-05-29 15:55:16 +01:00
David Baker
f54bac0e95 Use recovery keys over passphrases
Step 1 - change CreateSecretStorageDialog to just give a recovery key
rather than a passphrase.
2020-05-29 15:42:07 +01:00
Weblate
8b3d2f12c5 Merge branch 'origin/develop' into Weblate. 2020-05-29 14:34:07 +00:00
yuuki-san
4a29dc34fe Translated using Weblate (Slovak)
Currently translated at 68.2% (1570 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-29 14:34:07 +00:00
call_xz
658608e86c Translated using Weblate (Japanese)
Currently translated at 57.3% (1319 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-05-29 14:34:06 +00:00
random
92a2743ac4 Translated using Weblate (Italian)
Currently translated at 100.0% (2301 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-05-29 14:34:04 +00:00
XoseM
6bc1811809 Translated using Weblate (Galician)
Currently translated at 50.0% (1151 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-05-29 14:34:03 +00:00
Kévin C
28017f5b04 Translated using Weblate (French)
Currently translated at 100.0% (2301 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-29 14:34:00 +00:00
Travis Ralston
ea064afca4 Fix/document a number of UIA oddities
Edition 2 of https://github.com/matrix-org/matrix-react-sdk/pull/3211
Fixes https://github.com/vector-im/riot-web/issues/13837
2020-05-29 08:23:59 -06:00
Michael Telatynski
f40cfe4a3b Implement new design with new iconography
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 15:00:27 +01:00
Michael Telatynski
ccd0c952e3 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer
 Conflicts:
	src/components/views/rooms/MessageComposer.js
2020-05-29 14:53:42 +01:00
Michael Telatynski
d02a18bfff Apply FocusLock to ImageView to capture Escape handling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-29 01:44:09 +01:00
Jorik Schellekens
66c0d53f3e Create and use stylised checkboxes 2020-05-28 22:33:00 +01:00
Zoe
472c421150 Bubble up a decline-to-render of verification events to outside wrapper
This stops the event from appearing as a blank line.
2020-05-28 21:41:31 +01:00
Jorik Schellekens
6559fd499e Fix field placeholder regression 2020-05-28 21:09:42 +01:00
Weblate
14a4c31e58 Merge branch 'origin/develop' into Weblate. 2020-05-28 18:12:39 +00:00
Besnik Bleta
2740db5874 Translated using Weblate (Albanian)
Currently translated at 99.9% (2298 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-05-28 18:12:39 +00:00
Michael Telatynski
ab116e1e63
Merge pull request #4661 from matrix-org/t3chguy/notifier-race
Try and fix the Notifier race
2020-05-28 19:12:32 +01:00
Michael Telatynski
227fc24d3a delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 19:04:34 +01:00
Michael Telatynski
2530ec8419 Try and fix the Notifier race
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 19:03:42 +01:00
Weblate
8b94f3a66a Merge branch 'origin/develop' into Weblate. 2020-05-28 17:52:09 +00:00
Besnik Bleta
66c7551c2c Translated using Weblate (Albanian)
Currently translated at 99.0% (2279 of 2301 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-05-28 17:52:09 +00:00
Hubert Chathi
ec24350801
Merge pull request #4657 from matrix-org/uhoreg/keytar
set the client's pickle key if the platform can store one
2020-05-28 13:52:02 -04:00
Weblate
cadf5c30ad Merge branch 'origin/develop' into Weblate. 2020-05-28 17:21:37 +00:00
MamasLT
9c502ea821 Translated using Weblate (Lithuanian)
Currently translated at 66.5% (1529 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-28 17:21:37 +00:00
Tirifto
ffb829108b Translated using Weblate (Esperanto)
Currently translated at 100.0% (2299 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-05-28 17:21:36 +00:00
Michael Telatynski
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2
Migrate Banners to Toasts
2020-05-28 18:21:28 +01:00
Michael Telatynski
c4d6367a17 Swap priorities of Desktop Notifications and Update toasts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:30:43 +01:00
Michael Telatynski
8aaa7825ef Also kill off things that these kept behind
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:12:19 +01:00
Hubert Chathi
dc4a2191c1 really fix types 2020-05-28 12:04:32 -04:00
Michael Telatynski
f0cabd55c0 Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
as we now always `setGlobalErrorOnUnknownDevices(false)`

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 17:01:22 +01:00
Hubert Chathi
0859827910 fix types 2020-05-28 11:56:48 -04:00
Michael Telatynski
03058bacbd Dialog wrap title instead of taking same space as the close/cancel button
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-28 16:48:50 +01:00
Hubert Chathi
30120dc0c7 Merge remote-tracking branch 'upstream/develop' into keytar 2020-05-28 11:15:36 -04:00
Weblate
540059a5ed Merge branch 'origin/develop' into Weblate. 2020-05-28 13:54:15 +00:00
MamasLT
542d81699a Translated using Weblate (Lithuanian)
Currently translated at 66.5% (1529 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-28 13:54:14 +00:00
Jorik Schellekens
9034889414 Reorder interfaces 2020-05-28 14:43:01 +01:00
Jorik Schellekens
c9d5ed4d00 i18n 2020-05-28 14:32:20 +01:00
Jorik Schellekens
81922231ed Move Appearance tab to ts 2020-05-28 13:55:07 +01:00
Hubert Chathi
73c35ff80e set the client's pickle key if the platform can store one 2020-05-28 00:05:45 -04:00
Travis Ralston
9e2d80b8c8 Update documentation and auth dict submissions 2020-05-27 13:16:49 -06:00
Travis Ralston
81cae66732 Merge branch 'develop' into fix-register-auth-with-new-spec 2020-05-27 12:02:46 -06:00
Weblate
0188a0eebb Merge branch 'origin/develop' into Weblate. 2020-05-27 16:07:17 +00:00
Michael Telatynski
0fd5714e21
Merge pull request #4606 from matrix-org/t3chguy/peeking-races
Fix room alias lookup vs peeking race condition
2020-05-27 17:07:12 +01:00
Weblate
8ffe415f0a Merge branch 'origin/develop' into Weblate. 2020-05-27 16:05:38 +00:00
Jorik Schellekens
46134f5368
Merge pull request #4651 from JorikSchellekens/joriks/fix-encryption-icons-irc
Fix encryption icon miss-alignment
2020-05-27 17:05:32 +01:00
yuuki-san
4726ebaf9d Translated using Weblate (Slovak)
Currently translated at 68.7% (1580 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-27 16:04:12 +00:00
MamasLT
687cc4e77a Translated using Weblate (Lithuanian)
Currently translated at 64.6% (1486 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
2020-05-27 16:04:07 +00:00
random
6c323a1991 Translated using Weblate (Italian)
Currently translated at 100.0% (2299 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-05-27 16:04:06 +00:00
XoseM
8b23eb1db3 Translated using Weblate (Galician)
Currently translated at 49.1% (1129 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-05-27 16:04:04 +00:00
Michael Telatynski
e35c9d5bbf more testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 15:18:43 +01:00
Michael Telatynski
48de174576 remove debug
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 12:20:20 +01:00
Michael Telatynski
efa47f1a8e Change out debug
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 12:02:51 +01:00
Michael Telatynski
3dade4e759 tweak
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 11:48:48 +01:00
Michael Telatynski
254ed4b1b6 Add debug lined to figure out e2e test failure
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 11:33:42 +01:00
Michael Telatynski
cc68f53fc2 tidy up and delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:47:01 +01:00
Michael Telatynski
cf50e1a408 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:31:30 +01:00
Michael Telatynski
2b432b0d82 Remove feature_cross_signing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:28:25 +01:00
Weblate
b603e3ef18 Merge branch 'origin/develop' into Weblate. 2020-05-27 09:24:47 +00:00
yuuki-san
a2a950e00e Translated using Weblate (Slovak)
Currently translated at 66.7% (1537 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2020-05-27 09:24:47 +00:00
call_xz
3f6774560e Translated using Weblate (Japanese)
Currently translated at 56.9% (1312 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2020-05-27 09:24:46 +00:00
XoseM
f4651bf898 Translated using Weblate (Galician)
Currently translated at 46.8% (1080 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2020-05-27 09:24:45 +00:00
Kévin C
e79d29b6a3 Translated using Weblate (French)
Currently translated at 100.0% (2306 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-05-27 09:24:43 +00:00
Jeff Huang
005b1fa080 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2306 of 2306 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-05-27 09:24:41 +00:00
David Baker
8bac26c5e3
Merge pull request #4648 from matrix-org/dbkr/remove_keyshare_dialog
Remove the keyshare dialog
2020-05-27 10:24:33 +01:00
Michael Telatynski
c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
Weblate
69f4e8e68e Merge branch 'origin/develop' into Weblate. 2020-05-27 02:06:23 +00:00
Travis Ralston
515304d32e
Merge pull request #4654 from matrix-org/travis/roomlist/badge-updates
Update badge counts in new room list as needed
2020-05-26 20:06:17 -06:00
Travis Ralston
8370fa8bb4 Event.decrypted from the client 2020-05-26 19:56:56 -06:00
Travis Ralston
bf8a3d4419 Bind to the room instead of the client
Also add the other missing deregister handlers
2020-05-26 16:20:51 -06:00