Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,657 Commits 206 Branches 552 Tags 519 MiB
d4a1f592c1
Commit Graph

15657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Travis Ralston
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
Travis Ralston
6e3b06f364 Human de-linting 2019-05-15 13:56:15 -06:00
Bruno Windels
897e1735b5
Merge pull request #2978 from matrix-org/bwindels/message-edit-editor3 
Message editing: smaller fixes
 2019-05-15 17:20:40 +00: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
52c4d7b6b0 fixup edit icon 2019-05-15 15:53:02 +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
39b8d8957d Merge branch 'master' into develop 2019-05-15 14:31:30 +01:00
David Baker
4e3c39cd60 v1.1.2 2019-05-15 14:30:21 +01:00
David Baker
77384497b0 Prepare changelog for v1.1.2 2019-05-15 14:30:20 +01:00
David Baker
f09d98291c
Merge pull request #2976 from matrix-org/dbkr/gif_autoplay-2 
Always thumbnail for GIFs
 2019-05-15 14:27:03 +01:00
David Baker
cfe917e489
Merge pull request #2975 from matrix-org/dbkr/fix_sso_2 
Fix Single Sign-on
 2019-05-15 14:26:55 +01:00
J. Ryan Stinnett
ef5ac27ddc Add comment about thumbnailing for GIFs 2019-05-15 14:21:12 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
3ea187a524 Save content.info as a local for readability 2019-05-15 14:21:02 +01:00
David Baker
0cde4bf2cd lint 2019-05-15 14:19:23 +01:00
David Baker
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
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
22533ba2d4 use theme var for bg color 2019-05-15 10:12:16 +01:00
Bruno Windels
6b932d58e6 remove cruft from edit icon 2019-05-15 10:10:29 +01:00
Bruno Windels
d83e278f6b PR feedback, cleanup 2019-05-15 09:46:08 +01:00
J. Ryan Stinnett
1421e8e06b Tweak reply arrow and hover color 2019-05-15 09:12:53 +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
Michael Telatynski
fd07b5c476 use scss variable for grey 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-14 23:03:02 +01:00
Travis Ralston
9b5830bb08 Restore use of full mxid login 
See https://github.com/vector-im/riot-web/issues/9290
 2019-05-14 15:01:22 -06:00
Travis Ralston
34719b9a2e Only expose the fallback_hs_url if the homeserver is the default HS 
See https://github.com/vector-im/riot-web/issues/9290
 2019-05-14 13:10:02 -06:00
Travis Ralston
bb16357636 Flag all generated configs as non-default by default 
The app is expected to flag a particular config themselves as default. This is primarily intended so that other parts of the app can determine what to do based on whether or not the config is a default config.

See https://github.com/vector-im/riot-web/issues/9290
 2019-05-14 13:06:56 -06:00
Travis Ralston
4c1ac38dd4 Merge branch 'develop' into travis/feature/wellknown2 2019-05-14 10:53:01 -06: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
J. Ryan Stinnett
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