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

20651 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
3196655524 Replace UserInfo avatar with <MemberAvatar/> for fallback logic 2019-12-19 10:42:47 +00:00
Michael Telatynski
a1df87a375 Make EmojiPicker an unmanaged Context Menu as it is too complex to be managed 2019-12-19 07:23:05 +00:00
David Baker
a5d5569af4 Translated using Weblate (Japanese) 
Currently translated at 59.3% (1184 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2019-12-18 21:46:59 +00:00
Michael Telatynski
d35b01b63a Get rid of stripped-emoji.json in favour of an in-memory single truth source 2019-12-18 15:40:19 +00:00
Michael Telatynski
513ec30ef1 Fix tests v2 2019-12-17 18:02:45 +00:00
Michael Telatynski
f3ca4c0b7c fix tests 2019-12-17 17:54:19 +00:00
Travis Ralston
38e75aaae0
Merge pull request #3722 from matrix-org/travis/babel7 
[BREAKING] Refactor the entire build process for babel@7 and TypeScript (chunk 1 of many)
 2019-12-17 10:44:20 -07:00
Weblate
ce995d1a1e Merge branch 'origin/develop' into Weblate. 2019-12-17 17:39:47 +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
da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski
b094f0fe47 delint 2019-12-17 17:31:29 +00:00
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Weblate
7811bd8859 Merge branch 'origin/develop' into Weblate. 2019-12-17 17:02:41 +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
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