Commit graph

17160 commits

Author SHA1 Message Date
J. Ryan Stinnett
ca5a53729f
Merge pull request #3269 from matrix-org/jryans/dialog-button-borders
Fix dialog button border colours
2019-08-01 13:58:25 +01:00
J. Ryan Stinnett
701103aad7 Fix dialog button border colours
This corrects dialog button borders to match other buttons by removing the green
border from disabled and danger states.

Fixes https://github.com/vector-im/riot-web/issues/10310
2019-08-01 12:47:23 +01:00
J. Ryan Stinnett
36308b9ebf Check IS v2 account tokens for validity
Fixes https://github.com/vector-im/riot-web/issues/10452
2019-08-01 12:07:39 +01:00
Bruno Windels
abde8b45d2 fix bug that prevented a line from being removed when undoing a newline 2019-08-01 11:28:40 +02:00
Bruno Windels
9d49a5bb73 pass caret to history manager upon initial render
otherwise caret is put at editor start when undoing last step
2019-08-01 11:28:01 +02:00
Bruno Windels
234404e598 add mod+z/y shortcuts, set editor state to what history manager returns 2019-08-01 11:27:09 +02:00
Bruno Windels
98bc0d24f4 push changes to history manager 2019-08-01 11:26:20 +02:00
Bruno Windels
aa22c90f2c HistoryManager + unit tests 2019-08-01 11:25:04 +02:00
J. Ryan Stinnett
e33109cb8c
Merge pull request #3266 from matrix-org/jryans/upgrade-deps-2019-07-31
Upgrade dependencies
2019-07-31 18:51:19 +01:00
J. Ryan Stinnett
e5c3d91e53 Upgrade dependencies 2019-07-31 17:41:36 +01:00
RiotRobot
db43a81c0a v1.5.0-rc.1 2019-07-31 16:46:26 +01:00
RiotRobot
7fd5fc00e3 Prepare changelog for v1.5.0-rc.1 2019-07-31 16:46:26 +01:00
RiotRobot
6834083d88 Upgrade to JS SDK 2.3.0-rc.1 2019-07-31 16:36:02 +01:00
J. Ryan Stinnett
a3da9070e6
Merge pull request #3265 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-07-31 15:41:41 +01:00
Weblate
f83fc7484d Merge branch 'origin/develop' into Weblate. 2019-07-31 13:24:47 +00:00
Michael Telatynski
4694a9bf12
Merge pull request #3263 from matrix-org/t3chguy/prop-types
Replace React.PropTypes with usage of the `prop-types` package
2019-07-31 14:24:27 +01:00
Weblate
29bc73efa5 Merge branch 'origin/develop' into Weblate. 2019-07-31 12:48:10 +00:00
Bruno Windels
85076e4e05
Merge pull request #3264 from matrix-org/bwindels/diff-visuals
strikethrough & underline deletions & insertions
2019-07-31 12:47:50 +00:00
Bruno Windels
c093b6ed9c strikethrough & underline deletions & insertions 2019-07-31 14:44:48 +02:00
Weblate
1564e31d2f Merge branch 'origin/develop' into Weblate. 2019-07-31 11:57:52 +00:00
ferhad.necef
73bb9c8bd6 Translated using Weblate (Azerbaijani)
Currently translated at 23.5% (398 of 1695 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2019-07-31 11:57:52 +00:00
Bruno Windels
3e07d29926
Merge pull request #3261 from matrix-org/bwindels/edithistorywarning
Get rid of warning of required prop
2019-07-31 11:57:47 +00:00
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
Weblate
7ed9de9b77 Merge branch 'origin/develop' into Weblate. 2019-07-31 10:51:41 +00: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
Weblate
0e604eff22 Merge branch 'origin/develop' into Weblate. 2019-07-31 10:43:32 +00:00
hieronymousch
307af7aa10 Translated using Weblate (Dutch)
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/nl/
2019-07-31 10:43:32 +00:00
Osoitz
2412277626 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-31 10:43:31 +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
Bruno Windels
17e838e23b this is optional, and not provided for first edit 2019-07-31 09:47:02 +02: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
Weblate
d554556cdc Merge branch 'origin/develop' into Weblate. 2019-07-30 17:37:48 +00: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
Weblate
9ffbbd1fa6 Merge branch 'origin/develop' into Weblate. 2019-07-30 17:13:20 +00: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