Commit graph

15643 commits

Author SHA1 Message Date
Bruno Windels
ddefeae136 update design of editor to look as close to original tile (and design)
the buttons below the composer are overlayed onto the previous event.
In case of the last event, for now we make them not overflow, but make the
tile grow. The design says it should overlay on the main composer for the last
event tile, postponing that for a bit though as not sure what is the best way
to do that.
2019-05-17 15:33:11 +01:00
Bruno Windels
9a3752c571 show message editor in textual body instead of replacing event tile 2019-05-17 15:30:07 +01:00
Weblate
a0d40b2c93 Merge branch 'origin/develop' into Weblate. 2019-05-17 14:10:54 +00:00
Szimszon
fc58d282d7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1631 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-05-17 14:10:54 +00:00
Kévin C
e9e85238c7 Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 14:10:54 +00:00
Tuomas Hietala
f8e95a054f Translated using Weblate (Finnish)
Currently translated at 99.0% (1614 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-05-17 14:10:53 +00:00
Fendo
954f155345 Translated using Weblate (Esperanto)
Currently translated at 74.4% (1213 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-05-17 14:10:53 +00:00
J. Ryan Stinnett
43c9e6d942 Reactions / editing tooltip tweaks 2019-05-17 15:10:35 +01:00
grrgui
21106a2539 Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 13:45:47 +00:00
Hugues De Keyzer
5fb934c696 Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 13:45:46 +00:00
Jeff
c3f9440f24 Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 13:45:46 +00:00
nouts
21eda96ddf Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 13:45:46 +00:00
Kévin C
50ac8076a2 Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 13:45:46 +00:00
grrgui
9df3face98 Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 13:43:36 +00:00
Kévin C
83019b8671 Translated using Weblate (French)
Currently translated at 99.9% (1629 of 1631 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-05-17 13:43:36 +00:00
Bruno Windels
dbcf6af12d
Merge pull request #2992 from matrix-org/bwindels/caneditcheckfix
Fix not being able to edit already edited messages
2019-05-17 12:32:56 +00:00
Bruno Windels
76ceee0e6c silence react warning when showing edited marker, by also giving the body a key 2019-05-17 13:31:26 +01:00
Bruno Windels
f285040e0b check msgtype of original event 2019-05-17 13:26:06 +01:00
J. Ryan Stinnett
4c94b398d3
Merge pull request #2991 from matrix-org/jryans/reaction-names-tooltip
Add a basic tooltip showing who reacted
2019-05-17 13:02:29 +01:00
J. Ryan Stinnett
603e6b7055 Adjust edited tooltip to use shared styles 2019-05-17 12:19:02 +01:00
J. Ryan Stinnett
059988ff5c Extract tooltip styling to a shared class
We want to use the same styling with edited tooltip as well, so this extracts
the shared bits.
2019-05-17 12:11:01 +01:00
J. Ryan Stinnett
3da1f73ea4 Add a basic tooltip showing who reacted
This adds a first attempt at tooltip showing who reacted to a message. It
doesn't limit senders or position the tooltip nicely, but the info is there at
least.

Part of https://github.com/vector-im/riot-web/issues/9722
2019-05-17 12:11:01 +01:00
J. Ryan Stinnett
32c68feae2 Run translation substitution in 2 passes
By first substituting variables and then tags after, the translation handling
can now support strings with variables inside tags, such as:

"people <span>reacted with %(foo)s</span>"
2019-05-17 12:11:01 +01:00
Bruno Windels
c48ecb66d9
Merge pull request #2990 from matrix-org/bwindels/editedmarker
Message editing: show (edited) marker on edited messages, with tooltip
2019-05-17 11:04:09 +00:00
Bruno Windels
4a6725d4c2 Message editing: show (edited) marker on edited messages, with tooltip 2019-05-17 11:36:36 +01:00
David Baker
aa7ae4bd4f
Merge pull request #2989 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate
2019-05-17 10:54:26 +01:00
Weblate
48e2aad6d0 Merge branch 'origin/develop' into Weblate. 2019-05-17 09:40:15 +00:00
Bruno Windels
4bfa385b2e
Merge pull request #2988 from matrix-org/bwindels/donteditimages
Message editing: only allow editing of text messages
2019-05-17 09:40:10 +00:00
Weblate
658fb3506a Merge branch 'origin/develop' into Weblate. 2019-05-17 09:36:36 +00:00
Bruno Windels
396a06a868
Merge pull request #2987 from matrix-org/bwindels/entertosendedit
Message editing: shift+enter for newline, enter to send
2019-05-17 09:36:31 +00:00
Weblate
90d2097275 Merge branch 'origin/develop' into Weblate. 2019-05-17 09:26:46 +00:00
Filip Š
317898048e Translated using Weblate (Slovenian)
Currently translated at 0.7% (11 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sl/
2019-05-17 09:26:46 +00:00
Szimszon
34bd70f738 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1628 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-05-17 09:26:45 +00:00
Tuomas Hietala
2beb854d92 Translated using Weblate (Finnish)
Currently translated at 98.9% (1610 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-05-17 09:26:42 +00:00
Travis Ralston
e731ce32b8 Translated using Weblate (English (United States))
Currently translated at 44.1% (718 of 1628 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2019-05-17 09:26:38 +00:00
Bruno Windels
c0cfa8ad00 only allow editing of text messages 2019-05-17 10:26:19 +01:00
Bruno Windels
ca2e6d8eb2 Message editing: shift+enter for newline, enter to send 2019-05-17 10:22:02 +01:00
Travis Ralston
0070540b8a
Merge pull request #2985 from matrix-org/t3chguy/fix_devtools_alignment
Apply Flex voodoo for devtools send event dialog
2019-05-16 17:46:13 -06:00
Michael Telatynski
b2aad4afb1 remove accidental paste
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-17 00:28:45 +01:00
Travis Ralston
82bd893f03 Mute screen readers over reactions 2019-05-16 16:36:23 -06:00
Michael Telatynski
d7c6869188 Apply Flex voodoo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-05-16 21:55:17 +01:00
Travis Ralston
d5aa489eb0
Merge pull request #2984 from matrix-org/travis/i18n/spellings
Fix some source strings noticed as incorrect by translators
2019-05-16 14:45:55 -06:00
Travis Ralston
bc5227a191 Fix some source strings noticed as incorrect by translators 2019-05-16 14:35:56 -06:00
Bruno Windels
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
Bruno Windels
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
Bruno Windels
245f48a22c set caret on mount as we usually do, so FF doesn't enter 2 newlines 🤯 2019-05-16 18:39:20 +01:00
Bruno Windels
98e033a529 don't allow newline parts of longer than one newline 2019-05-16 18:13:48 +01:00
Bruno Windels
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
Bruno Windels
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
Bruno Windels
3ef631191b show sending status for replacements as well on local echo 2019-05-16 14:44:00 +01:00