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
99171010c9
Translated using Weblate (Basque)
...
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/eu/
2019-07-21 14:51:27 +00:00
19df115e57
Translated using Weblate (Esperanto)
...
Currently translated at 99.9% (1683 of 1685 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-07-20 14:17:52 +00:00
b040fbd029
Translated using Weblate (Esperanto)
...
Currently translated at 99.9% (1683 of 1685 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-07-20 14:17:51 +00:00
006de4053c
Translated using Weblate (Esperanto)
...
Currently translated at 99.8% (1681 of 1685 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-07-20 14:15:52 +00:00
023130bb4b
Redirect paste to composer when event target can't receive input
2019-07-19 17:49:04 +02:00
367218ad2a
Merge branch 'origin/develop' into Weblate.
2019-07-19 15:10:08 +00:00
84e2333105
Merge pull request #3226 from matrix-org/bwindels/readmarker-invisble-events
...
Move read marker past invisible events
2019-07-19 15:10:03 +00:00
db594aefa0
Merge branch 'origin/develop' into Weblate.
2019-07-19 14:42:00 +00:00
97d1ec160f
Translated using Weblate (Tamil)
...
Currently translated at 11.8% (198 of 1685 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ta/
2019-07-19 14:42:00 +00:00
c47b5ac847
Translated using Weblate (Chinese (Traditional))
...
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/zh_Hant/
2019-07-19 14:41:58 +00:00
c335c04c75
Merge pull request #3238 from matrix-org/bwindels/diffplainedits
...
Basic diff visualisation for plain text edits
2019-07-19 14:41:53 +00:00
c713172a37
add proptypes
2019-07-19 16:34:50 +02:00
de1c4e0cfe
better naming
2019-07-19 16:34:39 +02:00
f305d8ac08
Basic diff visualisation for plain text edits
2019-07-19 16:09:23 +02:00
3403a4b47b
Merge branch 'origin/develop' into Weblate.
2019-07-19 08:55:01 +00:00
0092272bc4
Translated using Weblate (Polish)
...
Currently translated at 72.9% (1228 of 1685 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2019-07-19 08:55:01 +00:00
3ee26b6135
Merge pull request #3237 from matrix-org/bwindels/fixcpfocus
...
Don't focus composer on keydown with modifier
2019-07-19 08:54:54 +00:00
77f5274cd8
don't focus composer on keydown with modifier
...
this breaks shortcuts like copy, ...
2019-07-19 09:10:20 +02:00
5179f1884e
Merge branch 'origin/develop' into Weblate.
2019-07-18 16:10:27 +00:00
4fa7302f69
Merge pull request #3224 from matrix-org/bwindels/focus-composer-on-type
...
Focus composer when typing anywhere in the app
2019-07-18 16:10:23 +00:00
0603efc7ee
Merge branch 'origin/develop' into Weblate.
2019-07-18 14:51:40 +00:00
03151418af
Merge branch 'master' into develop
2019-07-18 15:51:33 +01:00
3c0c64af8e
v1.4.0
2019-07-18 15:50:46 +01:00
8b0e36e884
Prepare changelog for v1.4.0
2019-07-18 15:50:45 +01:00
480061bde3
Upgrade JS SDK to v2.2.0
2019-07-18 15:46:38 +01:00
4a7264cc15
Merge pull request #3236 from matrix-org/jryans/v1.4.0/dontredactfirst
...
Don't show remove button for original event in edit history
2019-07-18 14:40:58 +01:00
1b06b9957a
dont show remove button for original event in edit history
2019-07-18 14:40:05 +01:00
8952b4ac4e
Merge branch 'origin/develop' into Weblate.
2019-07-18 13:35:11 +00:00
J. Ryan Stinnett