9744cbd448
Merge pull request #2983 from matrix-org/bwindels/editor-cursor-fixes
...
Message editing: fix some bugs in cursor behaviour
2019-05-16 20:05:48 +00:00
0c7aa39273
Merge branch 'develop' into travis/feature/wellknown2
2019-05-16 12:59:50 -06:00
3e10d3ceea
Merge pull request #2972 from matrix-org/travis/wk/mxid
...
Restore use of full mxid login
2019-05-16 12:58:35 -06:00
1ea5b42cf5
Merge branch 'travis/feature/wellknown2' into travis/wk/mxid
2019-05-16 12:47:37 -06:00
f75dc9c804
Merge pull request #2971 from matrix-org/travis/wk/fallback_hs
...
Only expose the fallback_hs_url if the homeserver is the default homeserver
2019-05-16 12:46:52 -06:00
8c326bff9e
Merge pull request #2964 from matrix-org/travis/wk/simplify-phases
...
Refactor "Next" button into ServerConfig components
2019-05-16 12:46:35 -06:00
690ee63bb4
prevent zero-length removals from deleting uneditable parts
...
This solves an issue where, when backspacing the proceeding character next to a pill,
chrome reports the caret as being in the pill node, not at
the start of the proceeding text node. This would cause the pill
to be removed together with proceeding character.
This is a bug in any case, removing 0 characters
shouldn't remove the part
2019-05-16 19:14:24 +01:00
245f48a22c
set caret on mount as we usually do, so FF doesn't enter 2 newlines 🤯
2019-05-16 18:39:20 +01:00
98e033a529
don't allow newline parts of longer than one newline
2019-05-16 18:13:48 +01:00
f27607a74c
don't put cursor position in NewlinePart after adding it
...
You can't append to it anyway, so mark it uneditable and skip
uneditable parts if that's where an edit ended up.
This has the added advantage that if there is text after a newly
insert pill, the cursor will be put just before it rather than
in the pill, after the last character.
2019-05-16 17:58:22 +01:00
0e3d4fbc0c
Merge pull request #2982 from matrix-org/bwindels/message-editing-local-echo
...
Message editing: local echo & back-pagination
2019-05-16 15:22:23 +00:00
3ef631191b
show sending status for replacements as well on local echo
2019-05-16 14:44:00 +01:00
31817a91c6
remove replacements flag
2019-05-16 14:43:47 +01:00
f7de8d4f58
use new events to find out about replacements
2019-05-16 14:43:32 +01:00
006d5d7591
Fix crash for null reactions set
2019-05-16 13:57:02 +01:00
88bee3363c
Merge pull request #2981 from matrix-org/jryans/reactions-status-bar
...
Listen for removed relations
2019-05-16 13:39:47 +01:00
e942939be9
Listen for removed relations
...
The JS SDK has learned how to remove relations when cancelled, so we should also
listen for those as well.
Part of https://github.com/vector-im/riot-web/issues/9731
2019-05-16 13:03:07 +01:00
2e7e71556b
Annotations by sender is now a Set
2019-05-16 12:45:41 +01:00
288e4afa98
Merge pull request #2980 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-05-16 10:57:15 +01:00
10e893b647
Merge branch 'origin/develop' into Weblate.
2019-05-16 09:05:54 +00:00
7f7e7221c5
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1593 of 1593 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-05-16 09:05:54 +00:00
3d86431f14
Translated using Weblate (Hindi)
...
Currently translated at 45.3% (722 of 1593 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
2019-05-16 09:05:54 +00:00
0e369bd12e
Merge pull request #2977 from matrix-org/jryans/encrypted-reactions
...
Use `getRelation` helper
2019-05-16 09:45:09 +01:00
33885cb864
Use `getRelation` helper
...
Use the `getRelation` helper to ensure we always read relation info from the
wire content as required in E2E rooms.
2019-05-16 09:25:33 +01:00
6f22acc3c6
Merge pull request #2979 from aaronraimist/imageview-tooltip
...
Add tooltips to rotate and close buttons in ImageView (#9686 )
2019-05-15 21:14:20 -06:00
c38b5cabb1
Allow the strings to be translated
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-15 22:11:51 -05:00
bfd37d8089
Add tooltips to rotate and close buttons in ImageView ( #9686 )
...
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2019-05-15 22:06:02 -05:00
60a13652df
Merge pull request #2965 from matrix-org/travis/wk/tooltip
...
Render underlines and tooltips on custom server names in auth pages
2019-05-15 14:13:44 -06:00
6e3b06f364
Human de-linting
2019-05-15 13:56:15 -06:00
897e1735b5
Merge pull request #2978 from matrix-org/bwindels/message-edit-editor3
...
Message editing: smaller fixes
2019-05-15 17:20:40 +00:00
085f2d199d
focus editor after clicking edit
2019-05-15 17:17:35 +01:00
d73f547f55
reapply pills, link preview, code highlighting, ... after edit
2019-05-15 15:55:03 +01:00
6366371c0d
add * to fallback messages for edits
2019-05-15 15:54:05 +01:00
b081a3156f
dont show edit button for messages that are not your own
2019-05-15 15:53:49 +01:00
52c4d7b6b0
fixup edit icon
2019-05-15 15:53:02 +01:00
76570beb3c
Merge pull request #2973 from matrix-org/bwindels/message-edit-editor2
...
Message editing: adjust to js-sdk changes of marking original event as replaced
2019-05-15 14:11:52 +00:00
39b8d8957d
Merge branch 'master' into develop
2019-05-15 14:31:30 +01:00
4e3c39cd60
v1.1.2
2019-05-15 14:30:21 +01:00
77384497b0
Prepare changelog for v1.1.2
2019-05-15 14:30:20 +01:00
f09d98291c
Merge pull request #2976 from matrix-org/dbkr/gif_autoplay-2
...
Always thumbnail for GIFs
2019-05-15 14:27:03 +01:00
cfe917e489
Merge pull request #2975 from matrix-org/dbkr/fix_sso_2
...
Fix Single Sign-on
2019-05-15 14:26:55 +01:00
ef5ac27ddc
Add comment about thumbnailing for GIFs
2019-05-15 14:21:12 +01:00
6ea590cf1f
Always thumbnail for GIFs
...
When displaying a GIF, we always want to thumbnail so that we can properly
respect the user's GIF autoplay setting (which relies on thumbnailing to produce
the static preview image).
Fixes https://github.com/vector-im/riot-web/issues/9658
2019-05-15 14:21:07 +01:00
3ea187a524
Save `content.info` as a local for readability
2019-05-15 14:21:02 +01:00
0cde4bf2cd
lint
2019-05-15 14:19:23 +01:00
00508367f6
Fix Single Sign-on
...
https://github.com/matrix-org/matrix-react-sdk/pull/2826 checked
that we had data in the crypto store if the had credentials in
localStorage. However, SSO stores creds in localStorage and then
redirects the browser to remove the loginToken parameter from the
URL without starting crypto, so after the redirect, we see creds
in localStorage but no crypto data, and error.
Fix by marking when we've successfully initialised crypto and only
erroring if that flag is set.
Fixes https://github.com/vector-im/riot-web/issues/9695
2019-05-15 14:19:14 +01:00
b4d2463d17
Merge pull request #2974 from matrix-org/dbkr/fix_sso
...
Fix Single Sign-on
2019-05-15 14:12:05 +01:00
fc636c6cb9
lint
2019-05-15 14:00:37 +01:00
da1bff1c5d
Fix Single Sign-on
...
https://github.com/matrix-org/matrix-react-sdk/pull/2826 checked
that we had data in the crypto store if the had credentials in
localStorage. However, SSO stores creds in localStorage and then
redirects the browser to remove the loginToken parameter from the
URL without starting crypto, so after the redirect, we see creds
in localStorage but no crypto data, and error.
Fix by marking when we've successfully initialised crypto and only
erroring if that flag is set.
Fixes https://github.com/vector-im/riot-web/issues/9695
2019-05-15 13:47:48 +01:00
5805a88ab9
adjust to js-sdk changes of marking original event as replaced
2019-05-15 11:54:26 +01:00
Bruno Windels