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
edc100163f
Merge pull request #2952 from matrix-org/bwindels/message-edit-editor
...
Initial support for editing messages
2019-05-15 09:23:01 +00:00
22533ba2d4
use theme var for bg color
2019-05-15 10:12:16 +01:00
6b932d58e6
remove cruft from edit icon
2019-05-15 10:10:29 +01:00
d83e278f6b
PR feedback, cleanup
2019-05-15 09:46:08 +01:00
1421e8e06b
Tweak reply arrow and hover color
2019-05-15 09:12:53 +01:00
9b40913838
Merge pull request #2957 from matrix-org/t3chguy/invite_perms
...
Check permission to invite before showing invite buttons/disable them
2019-05-14 23:15:59 +01:00
fd07b5c476
use scss variable for grey
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-14 23:03:02 +01:00
92c67cdcab
Merge pull request #2963 from matrix-org/travis/permalink-without-room
...
Support a backup room ID in PermalinkCreator
2019-05-14 10:28:26 -06:00
a2e0dc2f7e
Tweak message action bar position
...
This moves the message action bar up slightly to avoid covering message text.
2019-05-14 16:52:02 +01:00
dc21faa240
send edit also in n.new_content field
...
so we can have fallback content in the regular content for clients
that don't support edits. Note that we're not reading m.new_content
yet as it's going to be a bit of a headache to change this.
So for now just sending the edit in both the normal content and
the m.new_content subfield, so all events out there already
are well-formed
2019-05-14 16:32:08 +01:00
fd31e793d1
fix lint
2019-05-14 15:49:53 +01:00
0b18ff52c5
pass feature flag to js-sdk
2019-05-14 15:43:10 +01:00
45991bc3de
replace original event if there have been previous edits
2019-05-14 15:39:24 +01:00
15df72e629
reload events when event gets replaced in the timeline
2019-05-14 15:39:24 +01:00
e2388afb51
consistent naming between serialize and deserialize modules
2019-05-14 15:39:24 +01:00
036cb02c0e
add feature flag
2019-05-14 15:39:24 +01:00
759a4a54ef
send the actual m.replace event from composer content
2019-05-14 15:38:16 +01:00
34dbe5f314
add newline parts for text messages as well
2019-05-14 15:38:16 +01:00
3abdf6b100
also serialize to text and method to tell us if we need html for model
2019-05-14 15:38:16 +01:00
2fbe73e658
draft of formatting
2019-05-14 15:38:16 +01:00
eaf43d7277
correctly parse BRs
2019-05-14 15:38:16 +01:00
c98e716cbd
some pill styling
2019-05-14 15:38:16 +01:00
c44fed4bea
even less logging
2019-05-14 15:38:16 +01:00
a3b02cf0cc
make logging quiet
2019-05-14 15:38:16 +01:00
4ff37ca046
don't show model for now
2019-05-14 15:38:16 +01:00
9e0816c51c
find caret offset and calculate editor text in same tree-walking algo
...
instead of having the same logic twice
2019-05-14 15:38:16 +01:00
7ebb6ce621
WIP commit, newlines sort of working
2019-05-14 15:38:16 +01:00
9f597c7ec0
no comment nodes without react,so can bring this back to simpler version
2019-05-14 15:38:16 +01:00
7a85dd4e61
after completion, set caret in next part at start
...
instead of end of current part
2019-05-14 15:38:16 +01:00
2c3453d307
put caret after replaced part if no caretOffset is given by autocomplete
2019-05-14 15:38:16 +01:00
1a577eed11
take non-editable parts into account for new caret position
2019-05-14 15:38:16 +01:00
8d97c0033e
catch this for now as caret behaviour is still a bit flaky
2019-05-14 15:38:16 +01:00
580a89875a
fix autocompl. not always appearing/being updated when there is no part
2019-05-14 15:38:16 +01:00
bc14d4f58f
comment
2019-05-14 15:38:16 +01:00
22587da5ff
close autocomplete on enter
2019-05-14 15:38:16 +01:00
Bruno Windels