Matthew Hodgson
54cea146e8
fix ugly formatting
2019-05-19 16:48:15 +01:00
Matthew Hodgson
c63419f8a2
typos
2019-05-19 16:31:25 +01:00
Matthew Hodgson
a8297a7698
fix build
2019-05-19 16:11:12 +01:00
Matthew Hodgson
dc72641264
replace emojione with twemoji. completely untested & debugged & unoptimised
2019-05-19 15:23:43 +01:00
Travis Ralston
7a244b85c1
Merge pull request #2986 from matrix-org/travis/sr/reactions
...
Mute screen readers over reactions
2019-05-17 08:40:53 -06:00
J. Ryan Stinnett
43c9e6d942
Reactions / editing tooltip tweaks
2019-05-17 15:10:35 +01: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
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
Bruno Windels
31817a91c6
remove replacements flag
2019-05-16 14:43:47 +01:00
Bruno Windels
f7de8d4f58
use new events to find out about replacements
2019-05-16 14:43:32 +01:00
J. Ryan Stinnett
006d5d7591
Fix crash for null reactions set
2019-05-16 13:57:02 +01:00
J. Ryan Stinnett
88bee3363c
Merge pull request #2981 from matrix-org/jryans/reactions-status-bar
...
Listen for removed relations
2019-05-16 13:39:47 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
2e7e71556b
Annotations by sender is now a Set
2019-05-16 12:45:41 +01:00
David Baker
288e4afa98
Merge pull request #2980 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate
2019-05-16 10:57:15 +01:00
Weblate
10e893b647
Merge branch 'origin/develop' into Weblate.
2019-05-16 09:05:54 +00:00
Szimszon
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
Akarshan Biswas
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