Commit Graph

23246 Commits (b5b4bdbf3d2d62316d2936964bf2516f53166196)

Author SHA1 Message Date
J. Ryan Stinnett 34e2fd42ec
Merge pull request #4374 from matrix-org/jryans/backup-dialog-hellscape
Pass along key backup for bootstrap
2020-04-14 14:08:27 +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 3aa338f3a2
Merge pull request #4391 from matrix-org/t3chguy/sort_emoji_by_shortcodes
Sort emoji by shortcodes for autocomplete primarily for :-1 and :+1
2020-04-14 13:17:26 +01:00
Michael Telatynski e114effcfa make code more readable as per pr suggestion
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 13:07:44 +01:00
Michael Telatynski 17a893adc5
Merge pull request #4390 from matrix-org/t3chguy/fix_cmd_no_typing
Fix invalid commands when figuring out whether to set isTyping
2020-04-14 13:06:10 +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 e5d4ab9fdb
Merge pull request #4389 from matrix-org/t3chguy/deop_fail
op/deop return error if trying to affect an unknown user
2020-04-14 12:17:45 +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 4fc88d69a3 Remove unused react-addons-css-transition-group
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 01:04:54 +01:00
Michael Telatynski 3e057070fd Fix width of MVideoBody in FilePanel
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 00:56:21 +01:00
Michael Telatynski 71b4aab5dc Fix emoji tooltip flickering because onMouseOut&onMouseOver fired when moving between children
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 00:12:58 +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 3a0e1aeeaf Sort emoji by shortcodes for autocomplete so that :-1 and :+1 first results are correct
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 18:09:28 +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 6d33138950 op/deop return error if trying to affect an unknown user
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 16:41:07 +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 52064d2fd0
Merge pull request #4386 from matrix-org/t3chguy/order_match_buttons
Reverse order of they match/they don't match buttons
2020-04-10 15:51:28 +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 8f49ed664f
Merge pull request #4383 from matrix-org/travis/plural-delete
Use singular text on 'delete sessions' button for SSO
2020-04-09 16:39:59 -06: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 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 ef8c5033ee
Merge pull request #4376 from matrix-org/travis/jitsi-end
Obliterate widgets when they are minimized
2020-04-09 14:40:40 -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 74291e8c2d
Merge pull request #4370 from matrix-org/t3chguy/clear_event_line
Fix image thumbnail width when read receipts are hidden
2020-04-09 20:57:12 +01:00
J. Ryan Stinnett e1a496f231 Pass along key backup for bootstrap
If we ask for the key backup key early in creating secret storage to ensure we
trust the backup, then we stash it to ensure it's available to bootstrap as well
without prompting again.

Fixes https://github.com/vector-im/riot-web/issues/12958
2020-04-09 17:32:57 +01: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 928d4acd31
Merge pull request #4371 from matrix-org/dbkr/retry_master_key_fetch
Retry the request for the master key from SSSS on login
2020-04-09 14:20:36 +01: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
Michael Telatynski 60808ef6d2 apply clear:both to fix automatic margins for continuation events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-09 13:36:53 +01:00
Bruno Windels 282577cefb recalculate toasts when cross-signing gets en/disabled 2020-04-09 13:43:51 +02:00
Bruno Windels 291fae6493 update room trust when cross-signing gets en/disabled 2020-04-09 13:43:30 +02:00
J. Ryan Stinnett d4ba8103b6
Merge pull request #4365 from matrix-org/jryans/upgrade-2020-04-08
Upgrade deps
2020-04-09 10:19:16 +01:00
Michael Telatynski 120e2201ad
Merge pull request #4367 from matrix-org/t3chguy/app_load2
App load tweaks, i18n and localStorage
2020-04-09 10:16:19 +01:00
Michael Telatynski cef9dbe254 Analytics.js gets executed during times where localStorage is not ensured to exist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 21:42:58 +01:00
Michael Telatynski 68608c2bcb Fix gen-i18n.js script for .ts files
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 21:42:12 +01:00
Travis Ralston e30e245bc7
Merge pull request #4366 from matrix-org/travis/encode-widgets
Fix encoding of widget arguments
2020-04-08 13:12:03 -06: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
J. Ryan Stinnett c87d6c22df yarn upgrade 2020-04-08 14:49:52 +01:00