PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
20337 commits 1 branch 0 tags 338 MiB
Commit graph

20337 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
2e8d66fa36 Null-guard member mention pills for rooms you have left (notif panel) 2019-12-17 16:54:59 +00: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
Weblate
069129507f Merge branch 'origin/develop' into Weblate. 2019-12-17 16:45:54 +00: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
Weblate
1d9d812b04 Merge branch 'origin/develop' into Weblate. 2019-12-17 15:14:04 +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
d06f476a4d
Merge pull request #3723 from matrix-org/travis/babel7-reskindex 
Implementation of new potential skinning mechanism
 2019-12-17 08:09:59 -07:00
Weblate
b4f9b88025 Merge branch 'origin/develop' into Weblate. 2019-12-17 15:07:19 +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
Weblate
c0f3db1678 Merge branch 'origin/develop' into Weblate. 2019-12-17 10:07:18 +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
Weblate
285667d653 Merge branch 'origin/develop' into Weblate. 2019-12-17 09:55:22 +00:00
Szimszon
a7a7a9cb23 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1998 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-12-17 09:55:22 +00:00
Jeff Huang
284a1fdde7 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1998 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-12-17 09:55:21 +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
Travis Ralston
9865ce899b Add a bunch of docs 
We're making an assumption here that the decorator is actually all over the app when it's not.
 2019-12-16 16:34:46 -07:00
Travis Ralston
0a9985fb48 Rename decorator for clarity 2019-12-16 16:10:11 -07:00
Travis Ralston
434570eca9 Explain why MatrixClientPeg is the way it is 2019-12-16 16:07:58 -07:00
Travis Ralston
b8faaa23c1 Remove irrelevant targets 2019-12-16 16:06:43 -07:00
Weblate
b7e2acc5f0 Merge branch 'origin/develop' into Weblate. 2019-12-16 17:25:34 +00:00
Kévin C
eb5ebaf754 Translated using Weblate (French) 
Currently translated at 100.0% (2001 of 2001 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-12-16 17:25:34 +00: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