ac66388a7f
Add missing stubs to stubRoom.currentState
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 13:27:49 +01:00
f45b1bfdda
Fix StubRoom for react-sdk tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 13:18:02 +01:00
856e161c8b
add Debug
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 12:54:09 +01:00
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
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
48f219f090
null-guard
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-29 12:28:30 +01:00
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
38e01e7bb0
Merge pull request #3253 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-07-29 09:38:46 +01:00
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
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
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
61e3795128
Merge branch 'origin/develop' into Weblate.
2019-07-25 20:35:07 +00:00
c5f6ab41d2
Merge pull request #3248 from matrix-org/t3chguy/fix_rainbow_cmds
...
Fix /rainbowme and /rainbow breaking apart utf-16 emoji
2019-07-25 21:35:01 +01:00
657a11de83
Fix /rainbowme and /rainbow breaking apart utf-16 emoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-25 19:25:28 +01:00
190b99b489
Merge branch 'origin/develop' into Weblate.
2019-07-25 12:16:24 +00:00
cef67d5784
Merge pull request #3245 from matrix-org/jryans/tooltip-larger-buffer
...
Tweak interactive tooltip buffer area allow for overshoot
2019-07-25 13:16:20 +01:00
f5fbd30a28
Tweak interactive tooltip buffer area allow for overshoot
...
This uses a larger buffer area around the tooltip, as it easy to overshoot and
mouse the cursor past the tooltip.
Fixes https://github.com/vector-im/riot-web/issues/10400
2019-07-25 12:17:07 +01:00
e6fbcfe309
Merge branch 'origin/develop' into Weblate.
2019-07-25 10:38:30 +00:00
97e8c00986
Translated using Weblate (Hungarian)
...
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/hu/
2019-07-25 10:38:30 +00:00
a20abb4190
Translated using Weblate (French)
...
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/fr/
2019-07-25 10:38:29 +00:00
7296fb8fd3
Merge pull request #3243 from matrix-org/jryans/app-perm-url
...
Keep widget URL in permission screen to one line
2019-07-25 11:38:24 +01:00
80e27cc0e8
Merge branch 'origin/develop' into Weblate.
2019-07-24 13:27:48 +00:00
a5ac50f90f
Merge pull request #3242 from matrix-org/jryans/terms-modal
...
Avoid visual glitch when terms appear for Integration Manager
2019-07-24 14:27:43 +01:00
9445a0d386
Merge branch 'origin/develop' into Weblate.
2019-07-24 09:59:28 +00:00
346c20f49d
Translated using Weblate (Swedish)
...
Currently translated at 77.4% (1312 of 1695 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2019-07-24 09:59:28 +00:00
ac31b4b8f4
Merge pull request #3244 from matrix-org/bwindels/diffhtmledits
...
Show diff for formatted messages in the edit history
2019-07-24 09:59:23 +00:00
3753e5261d
Implement diffing html messages in the edit history
2019-07-24 11:28:56 +02:00
2d4264c39d
Keep widget URL in permission screen to one line
...
This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.
Fixes https://github.com/vector-im/riot-web/issues/10402
2019-07-23 18:06:37 +01:00
846a908bb4
Add missing copyright header
2019-07-23 17:52:00 +01:00
42dbdcbbf0
Merge branch 'origin/develop' into Weblate.
2019-07-23 16:39:01 +00:00
91eee1b45f
Translated using Weblate (Polish)
...
Currently translated at 73.0% (1237 of 1695 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-07-23 16:39:01 +00:00
6a90c125a7
Translated using Weblate (Chinese (Traditional))
...
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/zh_Hant/
2019-07-23 16:39:00 +00:00
e73690439f
Merge pull request #3239 from matrix-org/bwindels/redirectpastetocomposer
...
Redirect paste to composer when event target can't receive input
2019-07-23 16:38:55 +00:00
39d5aa7cf4
Avoid visual glitch when terms appear for IM
...
This avoids a visual glitch where the Integration Manager portal would briefly
appear, but then be replaced by a smaller Terms dialog when there's something to
agree to.
To resolve this minimal code churn, this cheats a bit and customises the size of
the terms dialog to match the IM portal modal when terms are shown for IM
purposes.
Fixes https://github.com/vector-im/riot-web/issues/10386
2019-07-23 15:11:38 +01:00
58fd828944
Merge pull request #3241 from matrix-org/bwindels/dofocuscomposer
...
Restore manual composing focusing logic
2019-07-23 11:55:44 +00:00
f2bcfea0fb
Revert "fix lint"
...
This reverts commit 5c1c1f64b6
2019-07-23 11:43:44 +02:00
d9d459bc6b
Merge branch 'origin/develop' into Weblate.
2019-07-23 09:32:19 +00:00
2eb8a8879b
Merge pull request #3199 from matrix-org/dbkr/terms
...
ToS for ISes/IMs: prompt on use screen
2019-07-23 10:32:11 +01:00
1b0d8510a2
Add note from commit message as a comment
2019-07-23 10:09:16 +01:00
82d7617287
add comments
2019-07-23 09:44:17 +02:00
ceb53dc0bb
Revert "remove unnessary manual focussing of composer"
...
This reverts commit 57abbc4273
2019-07-23 09:13:51 +02:00
7d7878245b
Strip path component from IM rest url
...
before passing to js-sdk. We continue to use the full URL for the
calls done by matrix-react-sdk, but the standard terms API called
by the js-sdk lives on the standard _matrix path. This means we
don't support running IMs on a non-root path, but it's the only
realistic way of transitioning to _matrix paths since configs in
the wild contain bits of the API path.
Once we've fully transitioned to _matrix URLs, we can give people
a grace period to update their configs, then use the rest url as
a regular base url.
2019-07-22 18:54:04 +01:00
e6009cbe7a
Merge branch 'origin/develop' into Weblate.
2019-07-22 11:56:15 +00:00
e3ffdf1dff
Merge pull request #3240 from matrix-org/jryans/defer-im-token
...
Defer IM token until widget is shown and permission granted
2019-07-22 12:56:11 +01:00
84bb0eb696
Remove random capital
2019-07-22 12:25:12 +01:00
b664259e2d
more syntactic sugar
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-22 12:23:55 +01:00
11ecb4ca54
s/terms /policies/
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2019-07-22 12:23:28 +01:00
09c2d899ac
Defer IM token until widget is shown and permission granted
...
This defers the work to request the IM token when displaying a widget until
after we know that widget will actually be shown and the user has granted
permission for this widget to be displayed.
This is useful in general to avoid making unnecessary token checks, but it's
particularly helpful with the new Terms API, so that we only show the Terms flow
when widget are actually being used (as opposed to entering the room where
widgets exist, but haven't been shown / permitted).
Part of https://github.com/vector-im/riot-web/issues/10088
2019-07-22 11:50:54 +01:00
90559c2c69
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (1685 of 1685 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-07-21 14:51:27 +00:00
00559b38ce
Translated using Weblate (Esperanto)
...
Currently translated at 100.0% (1685 of 1685 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-07-21 14:51:27 +00:00
Michael Telatynski