Commit Graph

10068 Commits

Author SHA1 Message Date
Travis Ralston b4b0c4c6df Add comments to highlight where we'll need m.widget support
For https://github.com/vector-im/riot-web/issues/13111
2020-04-09 15:14:07 -06:00
Travis Ralston 4d461c6d87 Merge pull request #4377 from matrix-org/travis/sticker-data
Pass widget data through from sticker picker
2020-04-09 14:48:33 -06:00
Travis Ralston 3dc03ba089 Pass widget data through from sticker picker
This allows for sticker pickers to have custom template variables.

Fixes https://github.com/vector-im/riot-web/issues/6716
2020-04-09 14:40:23 -06:00
Travis Ralston db3c7a8f1c Obliterate widgets when they are minimized
Fixes https://github.com/vector-im/riot-web/issues/12810

We do this to all widgets as we can't guarantee what sorts of other widgets might need similar treatment.
2020-04-09 14:31:46 -06:00
Michael Telatynski a9a253f27f Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee
Add toggle for e2ee when creating private room
2020-04-09 17:22:58 +01:00
David Baker 5dfcfb2147 Merge pull request #4372 from matrix-org/dbkr/search_fail_logging
Fix logging for failed searches
2020-04-09 16:27:08 +01:00
David Baker 53b753789a Fix logging for failed searches
error is an object so appending it to a string is not helpful
2020-04-09 16:04:14 +01:00
Bruno Windels c1dcb690b3 Merge pull request #4369 from matrix-org/bwindels/fixresetkeys
Ensure UI is updated when cross-signing gets disabled
2020-04-09 13:34:40 +00:00
David Baker b6ef30af8f Retry the request for the master key from SSSS on login
If this failed we assumed it didn't exist which would erroneously
prompt people to upgrade encryption.
2020-04-09 13:40:46 +01:00
Bruno Windels 291fae6493 update room trust when cross-signing gets en/disabled 2020-04-09 13:43:30 +02:00
Travis Ralston b5aaae1c27 Fix encoding of widget arguments
Fixes https://github.com/vector-im/riot-web/issues/12985

This is done by using a more modern API and de-encoding dollar signs.
2020-04-08 12:58:52 -06:00
Michael Telatynski 4041c030a5 Apply changes from Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
Michael Telatynski eec28ce38a Update styling and copy to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
J. Ryan Stinnett 8ffc206358 Merge pull request #4356 from matrix-org/travis/deactivate-sso
Support deactivating your account with SSO
2020-04-08 12:19:53 +01:00
J. Ryan Stinnett a5f6a07ed6 Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format
Add debug status for cached backup key format
2020-04-08 11:32:11 +01:00
Michael Telatynski ada860f163 Add toggle for e2ee when creating private room in x-signing world
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:50:22 +01:00
Michael Telatynski 4d7f3ba109 Merge pull request #4361 from matrix-org/t3chguy/fix_composer_placeholder1
Fix composer placeholder not updating
2020-04-08 10:45:35 +01:00
Michael Telatynski 4447370764 Fix composer placeholder not updating
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:19:52 +01:00
Michael Telatynski f61c888f0c Merge pull request #4358 from matrix-org/t3chguy/fix_complete_security
Fix sas verification buttons to match figma
2020-04-08 10:00:39 +01:00
Travis Ralston 900a05366e Fix share dialog correctly
componentDidMount fires too late for this dialog, so we need to set ourselves up in the constructor.

Fixes https://github.com/vector-im/riot-web/issues/13068
2020-04-07 15:22:38 -06:00
J. Ryan Stinnett c21dccc397 Add debug status for cached backup key format
Check backup key format to ease tracking such issues

Debug helper for https://github.com/vector-im/riot-web/issues/13057
2020-04-07 19:11:06 +01:00
Michael Telatynski 712e6e8c49 Fix sas verification buttons to match figma and remove useless inDialog prop from EncryptionPanel.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 19:03:12 +01:00
Travis Ralston 3ab9634249 Pluralize more differently 2020-04-07 11:46:53 -06:00
Travis Ralston 3be197cf86 Use singular copy when only deleting one device 2020-04-07 11:19:56 -06:00
David Baker 112e198a54 Merge pull request #4354 from matrix-org/dbkr/dont_block_dialogs_with_spinner
Don't show spinner over encryption setup dialogs
2020-04-07 17:08:38 +01:00
Michael Telatynski 5c5c095737 Merge pull request #4350 from matrix-org/t3chguy/default_home
Add new default home page fallback
2020-04-07 14:46:23 +01:00
Michael Telatynski b5e6f8b8c1 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 13:34:10 +01:00
David Baker bce22c620f Don't show spinner over encryption setup dialogs
Fixes https://github.com/vector-im/riot-web/issues/13051
2020-04-07 13:08:18 +01:00
Michael Telatynski 90255be499 Fix copy button on code blocks when there is no code just pre
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 11:17:19 +01:00
Michael Telatynski 4d002bd24d delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:51:51 +01:00
Michael Telatynski faab35738f Add new default home page fallback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-07 10:48:56 +01:00
Travis Ralston bdeba252ec Support deactivating your account with SSO
Fixes https://github.com/vector-im/riot-web/issues/12940
2020-04-06 15:42:06 -06:00
Michael Telatynski fc74d927c0 import VelocityBounce sync as it is *tiny* (481B)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-04 17:23:19 +01:00
Michael Telatynski fe401ce4da Merge branch 'develop' into t3chguy/xsigning/fix_userinfo_e2eicon 2020-04-03 18:38:30 +01:00
Bruno Windels adead76882 Merge branch 'develop' into bwindels/selfverifux 2020-04-03 17:53:07 +02:00
Bruno Windels 364421b088 adjust self-verification copy in incoming verif req toast 2020-04-03 17:04:58 +02:00
Bruno Windels cdbd4da0e4 adjust copy for self-verification in verification panel 2020-04-03 17:04:29 +02:00
Bruno Windels 030d594e67 for self-verif, mention which device, not user we're verifying in panel 2020-04-03 17:03:37 +02:00
Bruno Windels c15fa2ba0c Merge pull request #4334 from matrix-org/bwindels/qr-reciprocate
QR code reciprocation
2020-04-03 12:28:41 +00:00
Bruno Windels 2698751429 Merge pull request #4339 from jungeonkim/develop
Fix Hangul typing does not work properly
2020-04-03 11:52:53 +00:00
JungEon Kim 94236de637 Fix Hangul typing does not work properly
compositionstart event may fire in the meantime because
compositionend event is being processed asynchronously.

Signed-off-by: JungEon Kim <me@jungeon.kim>
2020-04-03 20:43:34 +09:00
J. Ryan Stinnett cabaf36794 Merge pull request #4340 from matrix-org/jryans/read-marker-groupers
Fix read marker visibility for grouped events
2020-04-03 11:07:46 +01:00
J. Ryan Stinnett 86f39ee0ee Fix read marker visibility for grouped events
The recent "groupers" which extracted out timeline grouping logic forgot to
pass through the last event state for read marker computation. This causes the
read marker to become visible when e.g. returning to room if it was last placed
inside a grouped set of events (currently room creation and membership events).

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/4059
Related to https://github.com/vector-im/riot-web/issues/12338
2020-04-03 01:14:31 +01:00
Bruno Windels 2ee780caa2 pass isSelf flag to sas component 2020-04-02 18:28:14 +02:00
Bruno Windels 6bb6885578 adjust sas copy to use device -> session 2020-04-02 18:28:01 +02:00
Bruno Windels cc9c5cabb3 adapt encryption info to self-verification
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
2020-04-02 17:51:25 +02:00
Bruno Windels 081baa2359 set dialog title for self-verification
use request.isSelfVerification helper
2020-04-02 17:51:06 +02:00
Bruno Windels 009941a6ac Merge branch 'bwindels/qr-reciprocate' into bwindels/selfverifux 2020-04-02 16:57:44 +02:00
Bruno Windels 1baaafe7b9 some comments to explain the mess 2020-04-02 16:44:42 +02:00
Bruno Windels 0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00