Travis Ralston
|
4fe16b1b84
|
Merge branch 'develop' into travis/moar-jitsi
|
2020-04-14 12:57:28 -06:00 |
|
Travis Ralston
|
36fea4d487
|
Merge pull request #4378 from matrix-org/travis/expanding-widgets
Minimize widgets by default
|
2020-04-14 12:56:10 -06:00 |
|
Travis Ralston
|
f0a2f5dd4f
|
Merge pull request #4380 from matrix-org/travis/widget-complaints
Add comments to highlight where we'll need m.widget support
|
2020-04-14 12:55:49 -06:00 |
|
Bruno Windels
|
aef6687931
|
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
Fix: don't confuse user with spinner during complete security step
|
2020-04-14 15:54:44 +00:00 |
|
Bruno Windels
|
861c449055
|
Merge pull request #4405 from matrix-org/bwindels/qrcodefix
Fix: avoid potential crash during certain verification paths
|
2020-04-14 15:21:47 +00:00 |
|
Bruno Windels
|
db09cadb66
|
remove spinner, change copy, add button placeholder
|
2020-04-14 17:19:15 +02:00 |
|
Michael Telatynski
|
7fa38933cb
|
Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back
Conflicts:
src/components/structures/LoggedInView.tsx
|
2020-04-14 15:54:58 +01:00 |
|
Bruno Windels
|
7b3c34bd12
|
use js-sdk qr code generation
|
2020-04-14 16:46:02 +02:00 |
|
Michael Telatynski
|
fc67d1d775
|
Merge pull request #4398 from matrix-org/t3chguy/liv
Convert LoggedInView to an ES6 PureComponent Class & TypeScript
|
2020-04-14 15:08:04 +01:00 |
|
Michael Telatynski
|
26569dea06
|
Revert "@replaceableComponent"
This reverts commit 50d6551c
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-14 14:59:20 +01:00 |
|
Michael Telatynski
|
50d6551c86
|
@replaceableComponent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-14 14:50:09 +01:00 |
|
Michael Telatynski
|
6416f404c6
|
Merge pull request #4403 from matrix-org/t3chguy/fix_e2ee_toggle
Fix create room dialog e2ee private room setting
|
2020-04-14 13:17:31 +01:00 |
|
Michael Telatynski
|
09d56e7bbc
|
Fix create room dialog e2ee private room setting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-14 13:05:23 +01:00 |
|
Michael Telatynski
|
46f7fadf3f
|
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-13 14:33:45 +01:00 |
|
Michael Telatynski
|
96c067a6c4
|
prefer protected over private so that the class can be extended
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-13 14:30:52 +01:00 |
|
Michael Telatynski
|
368e3f9e85
|
Convert LoggedInView to TypeScript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-13 14:29:00 +01:00 |
|
Michael Telatynski
|
379aeb667c
|
Convert LoggedInView to a PureComponent class
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-13 14:13:27 +01:00 |
|
Michael Telatynski
|
7e996cb91c
|
Add riot-desktop shortcuts for forward/back matching browsers&slack
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-11 18:57:59 +01:00 |
|
Michael Telatynski
|
7a936798b9
|
Fix invalid commands when figuring out whether to send typing notification
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-11 16:42:14 +01:00 |
|
Michael Telatynski
|
c000583099
|
Merge pull request #4384 from matrix-org/t3chguy/composer_pills
Composer pills respect showPillAvatar setting
|
2020-04-10 16:45:46 +01:00 |
|
Michael Telatynski
|
5846d09ae1
|
Merge pull request #4385 from matrix-org/t3chguy/slashcmd_typing
Only send typing notification when composing commands which send messages
|
2020-04-10 16:14:30 +01:00 |
|
Michael Telatynski
|
22558f090d
|
Reverse order of they match/they don't match buttons
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-10 15:38:17 +01:00 |
|
Michael Telatynski
|
caf0b25bd0
|
Only send typing notification when composing commands which send messages
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-10 13:59:01 +01:00 |
|
Michael Telatynski
|
740b6f6cac
|
Composer pills respect showPillAvatar setting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-04-10 09:34:38 +01:00 |
|
Travis Ralston
|
879b4e15e5
|
Use singular text on 'delete sessions' button for SSO
Missed in https://github.com/matrix-org/matrix-react-sdk/pull/4357
Not a release blocker at this time.
|
2020-04-09 16:18:12 -06:00 |
|
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
|
dc92f557fd
|
Support m.jitsi-typed widgets as Jitsi widgets
Fixes https://github.com/vector-im/riot-web/issues/9268
|
2020-04-09 15:11:57 -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
|
34be024b21
|
Minimize widgets by default
Fixes https://github.com/vector-im/riot-web/issues/12921
|
2020-04-09 14:47:20 -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 |
|