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

17020 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
201d7fb448 Merge branches 'develop' and 't3chguy/prop-types' of github.com:matrix-org/matrix-react-sdk into t3chguy/prop-types 
# Conflicts:
#	test/components/structures/MessagePanel-test.js
 2019-07-31 12:21:00 +01:00
Michael Telatynski
1087e04bb5 Replace React.PropTypes with usage of the prop-types package 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-31 12:19:29 +01:00
Bruno Windels
678c9a7213
Merge pull request #3262 from matrix-org/bwindels/fixhtmldiffs 
Fix html diffs repeating text sometimes
 2019-07-31 10:51:37 +00:00
J. Ryan Stinnett
fb77802d54
Merge pull request #3260 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms 
Introduce RoomContext for sharing state between RoomView and children
 2019-07-31 11:43:26 +01:00
Bruno Windels
95f9e48f91 workaround diff-dom returning redundant diff actions 2019-07-31 12:25:04 +02:00
J. Ryan Stinnett
c338f8bf1f Add room context to test 2019-07-31 11:17:28 +01:00
J. Ryan Stinnett
ddf558b3ed Fix context when using subtree of components 2019-07-31 11:10:49 +01:00
Michael Telatynski
4517fea496 Introduce RoomContext for sharing state between RoomView and children 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-31 00:47:38 +01:00
J. Ryan Stinnett
06bb18bda5
Merge pull request #3259 from matrix-org/jryans/anxious 
Upgrade emojibase to fix :anxious:
 2019-07-30 18:37:43 +01:00
J. Ryan Stinnett
8304522b7f Upgrade emojibase to fix :anxious: 
Fixes https://github.com/vector-im/riot-web/issues/10372
 2019-07-30 18:15:21 +01:00
J. Ryan Stinnett
a9a33f5dcb
Merge pull request #3256 from matrix-org/jryans/is-v2-auth 
Add support for IS v2 API with authentication
 2019-07-30 18:13:15 +01:00
J. Ryan Stinnett
92dbb58384 Add note to log out from IS 2019-07-30 17:41:26 +01:00
J. Ryan Stinnett
edcdac464c Add note to test tokens 2019-07-30 17:41:26 +01:00
J. Ryan Stinnett
15243ec2a5 Note cleanup issue 2019-07-30 17:41:26 +01:00
J. Ryan Stinnett
5bb68b4b3b Display lookup errors in the UI 2019-07-30 17:41:26 +01:00
J. Ryan Stinnett
55780f3caf Extend comment about checking tokens 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
4ebafb93c3 Rename isAccessToken to identityAccessToken 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
654a8c2cb8 Support IS v2 auth in haveMsisdnToken 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
9fa8012315 Convert haveMsisdnToken to async / await 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
dacb5d42ac Support IS v2 auth in preview bar 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
244b613623 Convert 3PID lookup in preview bar to async / await 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
18c4ece87a Improve error handling for IS auth 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
4d01d6a5b1 Move auth steps to IdentityAuthClient 2019-07-30 17:37:48 +01:00
J. Ryan Stinnett
432e70e2ce Add IS auth to AddressPickerDialog 2019-07-30 17:35:36 +01:00
J. Ryan Stinnett
dd792e10a9 Convert 3PID lookup in address picker to async / await 2019-07-30 17:35:35 +01:00
Bruno Windels
8b6c70f955
Merge pull request #3258 from matrix-org/bwindels/fixautocomplete 
Fix autocomplete for editing being broken
 2019-07-30 15:24:11 +00:00
Bruno Windels
a999acbd04 fix argument order 2019-07-30 17:17:25 +02:00
Bruno Windels
e855a056c7
Merge pull request #3247 from matrix-org/bwindels/editortests 
Unit tests for new editor
 2019-07-30 14:46:33 +00:00
Bruno Windels
44e4661198 document return type 2019-07-30 12:34:30 +02:00
Bruno Windels
4b08bf0e76 add tests for removing multiple characters in edit 2019-07-30 12:31:40 +02:00
Michael Telatynski
106af39a82
Merge pull request #3255 from matrix-org/t3chguy/hide_msg_action_buttons_on_perms 
Show MessageActionBar buttons conditionally on room state permissions
 2019-07-29 23:11:19 +01:00
Michael Telatynski
c70e404f65
Merge pull request #3249 from matrix-org/t3chguy/AddressPickerDialog_pasting 
Handle onPaste AddressPickerDialog, allow addressing CSV/NL/Space delim list
 2019-07-29 23:10:35 +01:00
Michael Telatynski
883b3d1563 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 22:30:07 +01:00
Michael Telatynski
31ab97772c Match code-style better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 22:27:31 +01:00
Michael Telatynski
7f2fdd4315
Merge pull request #3254 from matrix-org/t3chguy/composer_history_alt_up_always 
Move history with alt up/down regardless of where selection is
 2019-07-29 17:36:14 +01:00
Michael Telatynski
fd039431bc put maySendMessage stub on stubRoom in the right place 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 13:50:11 +01:00
Michael Telatynski
ac66388a7f Add missing stubs to stubRoom.currentState 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 13:27:49 +01:00
Michael Telatynski
f45b1bfdda Fix StubRoom for react-sdk tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 13:18:02 +01:00
Michael Telatynski
856e161c8b add Debug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 12:54:09 +01:00
Michael Telatynski
289ee86a5d Merge branches 'develop' and 't3chguy/hide_msg_action_buttons_on_perms' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide_msg_action_buttons_on_perms 2019-07-29 12:42:36 +01:00
Michael Telatynski
265ff452d7 Upgrade mockRoom to implement EventEmitter like mxRoom does 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 12:39:44 +01:00
Michael Telatynski
48f219f090 null-guard 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 12:28:30 +01:00
Michael Telatynski
7b2e18ff7c Show MessageActionBar buttons conditionally on room state permissions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 12:13:23 +01:00
Michael Telatynski
bf1d65623c Move history with alt up/down regardless of where selection is 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-29 11:31:22 +01:00
David Baker
38e01e7bb0
Merge pull request #3253 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2019-07-29 09:38:46 +01:00
Le Dang Trung
e4995aa70e Translated using Weblate (Vietnamese) 
Currently translated at 20.2% (343 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vi/
 2019-07-29 08:29:28 +00:00
Osoitz
f81e5bcdea Translated using Weblate (Basque) 
Currently translated at 100.0% (1695 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-07-29 08:29:21 +00:00
ferhad.necef
a264ff16e7 Translated using Weblate (Azerbaijani) 
Currently translated at 23.4% (396 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
 2019-07-29 08:29:20 +00:00
Michael Telatynski
a97e2e6ef2 clean up onPaste error handling in AddressPickerDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-25 21:49:22 +01:00
Michael Telatynski
c9e1c68726 Handle onPaste AddressPickerDialog, allow addressing CSV/NL/Space delim list 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-25 21:45:32 +01:00