Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,401 Commits 206 Branches 552 Tags 519 MiB
bc5227a191
Commit Graph

12526 Commits

Author SHA1 Message Date
Travis Ralston
bc5227a191 Fix some source strings noticed as incorrect by translators 2019-05-16 14:35:56 -06: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
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
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
J. Ryan Stinnett
0e369bd12e
Merge pull request #2977 from matrix-org/jryans/encrypted-reactions 
Use `getRelation` helper
 2019-05-16 09:45:09 +01:00
J. Ryan Stinnett
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
Travis Ralston
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
Aaron Raimist
c38b5cabb1
Allow the strings to be translated 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-05-15 22:11:51 -05:00
Aaron Raimist
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
Bruno Windels
085f2d199d focus editor after clicking edit 2019-05-15 17:17:35 +01:00
Bruno Windels
d73f547f55 reapply pills, link preview, code highlighting, ... after edit 2019-05-15 15:55:03 +01:00
Bruno Windels
6366371c0d add * to fallback messages for edits 2019-05-15 15:54:05 +01:00
Bruno Windels
b081a3156f dont show edit button for messages that are not your own 2019-05-15 15:53:49 +01:00
Bruno Windels
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
David Baker
b4d2463d17
Merge pull request #2974 from matrix-org/dbkr/fix_sso 
Fix Single Sign-on
 2019-05-15 14:12:05 +01:00
David Baker
fc636c6cb9 lint 2019-05-15 14:00:37 +01:00
David Baker
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
Bruno Windels
5805a88ab9 adjust to js-sdk changes of marking original event as replaced 2019-05-15 11:54:26 +01:00
Kenneth Larsson
e4b4da4f8d Translated using Weblate (Swedish) 
Currently translated at 84.8% (1351 of 1593 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2019-05-15 10:24:23 +00:00
Szimszon
6f63df5694 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-15 10:24:21 +00:00
natowi
b55b41257a Translated using Weblate (German) 
Currently translated at 92.7% (1477 of 1593 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2019-05-15 10:24:20 +00:00
Kévin C
129cb8ea29 Translated using Weblate (French) 
Currently translated at 99.9% (1591 of 1593 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-05-15 10:24:20 +00:00
Nathan Follens
8a94d00edc Translated using Weblate (Dutch) 
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/nl/
 2019-05-15 10:24:18 +00:00
Jeff Huang
40d9bc7b34 Translated using Weblate (Chinese (Traditional)) 
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/zh_Hant/
 2019-05-15 10:24:17 +00:00
Slavi Pantaleev
6f393b5d91 Translated using Weblate (Bulgarian) 
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/bg/
 2019-05-15 10:24:16 +00:00
Osoitz
aa361a251b Translated using Weblate (Basque) 
Currently translated at 97.7% (1556 of 1593 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-05-15 10:24:13 +00:00
Bruno Windels
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
Bruno Windels
d83e278f6b PR feedback, cleanup 2019-05-15 09:46:08 +01:00
Michael Telatynski
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
Travis Ralston
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
Bruno Windels
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
Bruno Windels
fd31e793d1 fix lint 2019-05-14 15:49:53 +01:00
Bruno Windels
0b18ff52c5 pass feature flag to js-sdk 2019-05-14 15:43:10 +01:00
Bruno Windels
45991bc3de replace original event if there have been previous edits 2019-05-14 15:39:24 +01:00
Bruno Windels
15df72e629 reload events when event gets replaced in the timeline 2019-05-14 15:39:24 +01:00
Bruno Windels
e2388afb51 consistent naming between serialize and deserialize modules 2019-05-14 15:39:24 +01:00
Bruno Windels
036cb02c0e add feature flag 2019-05-14 15:39:24 +01:00
Bruno Windels
759a4a54ef send the actual m.replace event from composer content 2019-05-14 15:38:16 +01:00
Bruno Windels
34dbe5f314 add newline parts for text messages as well 2019-05-14 15:38:16 +01:00