Michael Telatynski
4fe0150944
Regen yarn.lock
2019-12-19 10:51:55 +00:00
Michael Telatynski
affc8b8459
Merge branches 'develop' and 't3chguy/jest' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/jest
...
Conflicts:
yarn.lock
2019-12-19 10:50:14 +00:00
Michael Telatynski
f30e919f9e
Merge pull request #3741 from matrix-org/t3chguy/dropdown_keyboard_propagation
...
Dropdown stop keyboard propagation if key handled
2019-12-17 17:39:41 +00:00
Michael Telatynski
b094f0fe47
delint
2019-12-17 17:31:29 +00:00
Travis Ralston
1a44f01f0a
Merge pull request #3742 from matrix-org/travis/rp-memberinfo
...
Fix right panel for multiple member info viewings
2019-12-17 10:02:35 -07:00
Travis Ralston
16181ff0ed
Fix right panel for multiple member info viewings
...
Fixes https://github.com/vector-im/riot-web/issues/11663
Member info is special because it has parameters associated with it. What was happening was the RightPanelStore was seeing that it was already on member info and deciding to hide the pane instead. What we do now is consider any phase change with parameters (such as the user to pass to member info) as a proper phase change.
2019-12-17 09:47:06 -07:00
Michael Telatynski
3f5dc4fcdc
Merge pull request #3740 from matrix-org/t3chguy/field_validation_async_tooltip_sticks
...
Fix Field validation tooltip sticking if blurred before async validation resolved
2019-12-17 16:45:48 +00:00
Michael Telatynski
7f78f55c94
Dropdown stop keyboard propagation if key handled
2019-12-17 15:14:01 +00:00
Michael Telatynski
0c89ab9fb5
Merge pull request #3738 from matrix-org/t3chguy/null-guard-useIsEncrypted
...
Fix UserInfo exploding without a room being passed to it
2019-12-17 15:13:59 +00:00
Travis Ralston
590ef79300
Merge pull request #3737 from matrix-org/travis/room-dir
...
Fix room directory maintaining and error state
2019-12-17 08:07:12 -07:00
Michael Telatynski
0e86c2648d
improve comment
2019-12-17 14:36:20 +00:00
Michael Telatynski
213bc4c3ac
Fix Field validation tooltip sticking if blurred before async validation resolved
2019-12-17 14:28:18 +00:00
Michael Telatynski
c1133ebfc6
null-guard useIsEncrypted
2019-12-17 14:05:51 +00:00
Michael Telatynski
b9e22f8141
add delay
2019-12-17 13:11:30 +00:00
Michael Telatynski
a2246374f1
correct testMatch so it doesn't try run js-sdk tests
2019-12-17 13:05:18 +00:00
Michael Telatynski
409a111b02
wait additional tick
2019-12-17 12:42:47 +00:00
Michael Telatynski
bcba9a3e50
fix yarn test for bashy things v2
2019-12-17 12:23:51 +00:00
Michael Telatynski
f06a94388f
fix yarn test for bashy things
2019-12-17 12:22:11 +00:00
Michael Telatynski
386d6ec055
we don't need to install riot-web for react-sdk unit tests
2019-12-17 12:16:40 +00:00
Michael Telatynski
c3415d2121
delint
2019-12-17 12:09:01 +00:00
Michael Telatynski
802092bf9a
All tests passing locally. We no longer need Chrome in buildkite
2019-12-17 11:53:18 +00:00
Michael Telatynski
e6d8487302
Fix more tests
2019-12-17 11:47:01 +00:00
Michael Telatynski
ab3fb6581b
Down to 7 test failures
2019-12-17 11:24:37 +00:00
Michael Telatynski
0140338ac5
Merge pull request #3735 from matrix-org/t3chguy/address_picker_dialog_tab_trap
...
Stop trapping tab in AddressPickerDialog
2019-12-17 10:07:12 +00:00
Michael Telatynski
17463c401f
post-merge fix
2019-12-17 09:58:04 +00:00
Michael Telatynski
d7a411f588
Merge branch 'develop' into t3chguy/address_picker_dialog_tab_trap
2019-12-17 09:57:28 +00:00
Michael Telatynski
3a8ab6ec2b
Merge pull request #3736 from matrix-org/t3chguy/stop_using_deprecated_keyCode
...
Stop using KeyboardEvent.keyCode as it is deprecated
2019-12-17 09:55:13 +00:00
Travis Ralston
b2a1a40961
Fix room directory maintaining and error state
...
Fixes https://github.com/vector-im/riot-web/issues/11665
We weren't clearing the error from a previous lookup, which effectively prevented the UI from working after an error happened.
2019-12-16 16:47:33 -07:00
Michael Telatynski
dd216d1b3a
Merge pull request #3733 from matrix-org/t3chguy/remove_avatar_2.0
...
Implement new design for uploading/removing avatars
2019-12-16 17:25:27 +00:00
Michael Telatynski
eaabe351d9
Stop trapping tab in AddressPickerDialog
2019-12-16 17:23:56 +00:00
Michael Telatynski
3b0f8233e8
delint
2019-12-16 17:22:00 +00:00
Michael Telatynski
d28a892bb0
Stop using KeyboardEvent.keyCode as it is deprecated
2019-12-16 17:14:03 +00:00
Michael Telatynski
7b4ad61bea
post-merge fix
2019-12-16 16:23:35 +00:00
Michael Telatynski
bf06b1f379
Merge branches 'develop' and 't3chguy/remove_avatar_2.0' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_avatar_2.0
...
Conflicts:
res/css/views/settings/_ProfileSettings.scss
2019-12-16 16:23:25 +00:00
Michael Telatynski
3ec60b1692
Merge pull request #3731 from matrix-org/t3chguy/avatar_fixes
...
Fix aspect ratio on room/profile avatar preview
2019-12-16 16:22:51 +00:00
Michael Telatynski
6f5ac780fa
Use new image.svg placeholder for AvatarSetting in Rooms
2019-12-16 16:19:43 +00:00
Michael Telatynski
5f2d9e8346
Merge pull request #3732 from matrix-org/t3chguy/context_menus_in_modals
...
Switch to react-focus-lock for it to comprehend Portals
2019-12-16 16:15:41 +00:00
Michael Telatynski
5ab98e9899
open ImageView when clicking on a set avatar
2019-12-16 15:21:05 +00:00
Michael Telatynski
9fa2680dc6
Implement new design for uploading/removing avatars
2019-12-16 14:58:12 +00:00
Michael Telatynski
4a2217bb79
Regenerate yarn.lock
2019-12-16 12:23:21 +00:00
Michael Telatynski
85ade7e1a1
Switch to react-focus-lock for it to comprehend Portals
2019-12-16 12:16:41 +00:00
Michael Telatynski
d64d90b704
Fix aspect ratio on room/profile avatar preview
2019-12-16 12:01:43 +00:00
Michael Telatynski
0041dae664
26 test failures to go :D
2019-12-16 11:55:01 +00:00
Michael Telatynski
2569b78db3
Merge pull request #3729 from matrix-org/t3chguy/aria_dropdown
...
Make combobox dropdown keyboard and screen reader accessible
2019-12-16 11:14:46 +00:00
Michael Telatynski
6ad31fe023
30 test failures to go :D
2019-12-16 11:12:48 +00:00
David Baker
be914c7b0c
Merge pull request #3728 from matrix-org/jryans/verify-users
...
Verify users when cross-signing enabled
2019-12-16 10:12:46 +00:00
David Baker
b89728c6cf
Merge pull request #3730 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-12-16 10:05:28 +00:00
Michael Telatynski
9c4eb1d649
clean up new code
2019-12-16 10:03:40 +00:00
random
ed5bfb7acf
Translated using Weblate (Italian)
...
Currently translated at 99.9% (1993 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-12-16 09:57:03 +00:00
Stanislav Lukeš
671ec51c01
Translated using Weblate (Czech)
...
Currently translated at 98.4% (1962 of 1994 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2019-12-16 09:57:02 +00:00