Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity
39,930 Commits 1 Branch 646 Tags
4bf42babc740b5a7f4e5010a94de81a91eddc1e1
Commit Graph

16504 Commits

Author SHA1 Message Date
Marcel 0e42a6ff85 Send empty auth key value pair if doing FallbackStage 
Took 3 minutes
 2020-04-10 19:16:15 +02: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
Tulir Asokan ec7acd1c0f Fix rendering reply after event is decrypted 2020-04-10 15:56:09 +03:00
Tulir Asokan 25af26323c Make image reply rendering even more compact 2020-04-10 15:45:59 +03:00
Tulir Asokan 9b023fb37d Add missing semicolon 2020-04-10 14:52:24 +03:00
Tulir Asokan e64ff0f099 Change score color to match sender name 2020-04-10 14:39:16 +03:00
Tulir Asokan 03299a28a4 Fix import/export things 2020-04-10 14:23:34 +03:00
Tulir Asokan 26a4a23a33 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2020-04-10 13:56:01 +03: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
Michael Telatynski 0153f39c10 Rageshake, remind user of unsupported browser and report missing features in report 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-09 22:55:28 +01: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
Marcel Radzio 003ae18038 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-register-auth-with-new-spec 2020-04-09 15:03:02 +02: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
Marcel a6fc235461 Merge remote-tracking branch 'origin/fix-register-auth-with-new-spec' into fix-register-auth-with-new-spec 2020-04-08 20:55:19 +02:00
Marcel 69c1e117a3 Fix submitAuthDict(null) being null in places where it actually should be auth: {} 
Took 16 minutes
 2020-04-08 20:55:02 +02:00
Marcel 9820400680 Update src/components/structures/auth/Registration.js 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-04-08 20:53:05 +02: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