8b25223026
fix onLoggedIn getting called twice
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 13:45:12 +01:00
76ce4081cb
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:31:27 +01:00
346b2e8588
Login block on initialSync with spinners
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00
e9c755e73f
Remove end-to-end message info option when cross-signing is used
...
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.
Relates to https://github.com/vector-im/riot-web/issues/11752
2020-04-15 10:25:05 +01:00
36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets
...
Minimize widgets by default
2020-04-14 12:56:10 -06:00
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
769cf1c987
Allow network dropdown to be scrollable and fix context menu window padding calc
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 17:34:39 +01:00
69e680da3c
Merge pull request #4407 from matrix-org/bwindels/checkifxsignisdisabledforlegacyverif
...
Fix: dont try to enable 4S if cross-signing is disabled
2020-04-14 16:12:16 +00:00
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
24fe125cb6
dont try to enable 4S if cross-signing is disabled
2020-04-14 17:53:33 +02:00
368737cfd9
fix copyright
2020-04-14 17:41:06 +02:00
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
db09cadb66
remove spinner, change copy, add button placeholder
2020-04-14 17:19:15 +02:00
4c7bc61174
Merge pull request #4392 from matrix-org/t3chguy/electron-forward-back
...
Add riot-desktop shortcuts for forward/back matching browsers&slack
2020-04-14 16:03:24 +01:00
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
7b3c34bd12
use js-sdk qr code generation
2020-04-14 16:46:02 +02:00
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
8d3119ddb4
Merge pull request #4396 from matrix-org/t3chguy/fix_MVideoBody_FilePanel
...
Fix width of MVideoBody in FilePanel
2020-04-14 15:02:28 +01:00
26569dea06
Revert "@replaceableComponent"
...
This reverts commit 50d6551c
2020-04-14 14:59:20 +01:00
f8d3073690
Merge pull request #4397 from matrix-org/t3chguy/deps1
...
Remove unused react-addons-css-transition-group
2020-04-14 14:54:24 +01:00
50d6551c86
@replaceableComponent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:50:09 +01:00
a7d95d396e
fix copyright
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:46:04 +01:00
f84c59dea7
Merge pull request #4395 from matrix-org/t3chguy/fix_emoji_tooltip_flicker
...
Fix emoji tooltip flickering
2020-04-14 14:28:29 +01:00
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
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
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
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
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
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
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
46f7fadf3f
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-13 14:33:45 +01:00
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
368e3f9e85
Convert LoggedInView to TypeScript
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-13 14:29:00 +01:00
379aeb667c
Convert LoggedInView to a PureComponent class
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-13 14:13:27 +01:00
4fc88d69a3
Remove unused react-addons-css-transition-group
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 01:04:54 +01:00
3e057070fd
Fix width of MVideoBody in FilePanel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 00:56:21 +01:00
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
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
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
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
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
c000583099
Merge pull request #4384 from matrix-org/t3chguy/composer_pills
...
Composer pills respect showPillAvatar setting
2020-04-10 16:45:46 +01:00
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
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
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
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
740b6f6cac
Composer pills respect showPillAvatar setting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-10 09:34:38 +01:00
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
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
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
Michael Telatynski