OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
24,318 Commits
218 Branches
561 Tags
439 MiB
Commit Graph

24318 Commits (88df8790dfd19d88cb07613088b72732190b4341)

Author SHA1 Message Date
J. Ryan Stinnett 88df8790df
Merge pull request #4616 from matrix-org/jryans/release-4607 
Remove SSSS key upgrade check from rageshake
 2020-05-22 13:43:17 +01:00
David Baker badda5ae81 Remove SSSS key upgrade check from rageshake 
This code doesn't exist anymore as the SSSS symmetric upgrade stuff
has been removed.

Fixes https://github.com/vector-im/riot-web/issues/13715
 2020-05-22 12:36:27 +01:00
RiotRobot 26e6447be5 v2.6.0 2020-05-19 11:22:00 +01:00
RiotRobot bc8a53a7d7 Prepare changelog for v2.6.0 2020-05-19 11:21:59 +01:00
RiotRobot 406839e89a Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:13:57 +01:00
Michael Telatynski 657c10f1b5
Merge pull request #4602 from matrix-org/t3chguy/cherry-pick/5 
Revert "ImageView make clicking off it easier"
 2020-05-18 10:24:57 +01:00
Michael Telatynski b6ac8cb28d Revert "ImageView make clicking off it easier" 
(cherry picked from commit 52e3c97f8c)
 2020-05-18 10:15:30 +01:00
Travis Ralston 6cdfe869be
Merge pull request #4598 from matrix-org/travis/fix-emails-release 
Remove debugging that causes email addresses to load forever (to release)
 2020-05-14 10:01:56 -06:00
Travis Ralston 67822f9e69 Remove debugging that causes email addresses to load forever 
This was left in by accident for https://github.com/matrix-org/matrix-react-sdk/pull/4557
 2020-05-14 09:53:23 -06:00
RiotRobot 81174b5f55 v2.6.0-rc.1 2020-05-14 16:30:17 +01:00
RiotRobot 4a7487aa20 Prepare changelog for v2.6.0-rc.1 2020-05-14 16:30:17 +01:00
RiotRobot d8003df24c Upgrade matrix-js-sdk to 6.1.0-rc.1 2020-05-14 16:22:30 +01:00
J. Ryan Stinnett 8a9502a8cb
Merge pull request #4596 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-05-14 15:59:50 +01:00
Weblate 5ac6794f62 Merge branch 'origin/develop' into Weblate. 2020-05-14 14:48:25 +00:00
Michael Telatynski 087d514c4c
Merge pull request #4595 from matrix-org/t3chguy/edit_crash 
Fix message edits dialog being wrong and sometimes crashing
 2020-05-14 15:48:19 +01:00
Michael Telatynski e241da3af0 Fix diff wrong route offsets because of skipping a node insert 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 15:35:38 +01:00
Weblate 691d3924fa Merge branch 'origin/develop' into Weblate. 2020-05-14 13:52:24 +00:00
random 91134601f6 Translated using Weblate (Italian) 
Currently translated at 100.0% (2308 of 2308 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-05-14 13:52:24 +00:00
Priit Jõerüüt 72e5e2e4b9 Translated using Weblate (Estonian) 
Currently translated at 46.8% (1079 of 2308 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-14 13:52:23 +00:00
Stanislav Lukeš 822b4b4fff Translated using Weblate (Czech) 
Currently translated at 95.2% (2198 of 2308 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-14 13:52:23 +00:00
Travis Ralston acc17e6026
Merge pull request #4584 from matrix-org/travis/deactivate-fix 
Acquire a new session before enacting deactivation
 2020-05-14 07:52:17 -06:00
Weblate 0872c0a23d Merge branch 'origin/develop' into Weblate. 2020-05-14 08:10:50 +00:00
Imre Kristoffer Eilertsen 9869ae4672 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 57.6% (1332 of 2312 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-05-14 08:10:49 +00:00
Kévin C 1af2bdbc0e Translated using Weblate (French) 
Currently translated at 100.0% (2312 of 2312 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-05-14 08:10:49 +00:00
Priit Jõerüüt 5672ff577b Translated using Weblate (Estonian) 
Currently translated at 46.7% (1080 of 2312 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-14 08:10:49 +00:00
Jeff Huang 62fee73242 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2312 of 2312 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-05-14 08:10:46 +00:00
Bruno Windels 4a8e642400
Merge pull request #4581 from matrix-org/bwindels/remove-asym-4s 
Remove UI for upgrading 4S to symmetric encryption
 2020-05-14 08:10:39 +00:00
Weblate 39ccbd07cb Merge branch 'origin/develop' into Weblate. 2020-05-13 21:33:16 +00:00
Stanislav Lukeš 226e4b297a Translated using Weblate (Czech) 
Currently translated at 95.4% (2201 of 2307 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-13 21:33:16 +00:00
Travis Ralston 9dd93f14ba
Merge pull request #4555 from matrix-org/travis/sso-xsigning 
Add copy to SSO prompts during cross-signing setup
 2020-05-13 15:33:09 -06:00
Weblate bed6c0b94c Merge branch 'origin/develop' into Weblate. 2020-05-13 16:02:50 +00:00
David Baker 8e31040c1a
Merge pull request #4592 from matrix-org/dbkr/fix_persistent_widgets_desktop_2 
Re-fix OpenID requests from widgets
 2020-05-13 17:02:44 +01:00
David Baker 50107ebe47 Re-fix OpenID requests from widgets 
https://github.com/matrix-org/matrix-react-sdk/pull/4591 reverted
https://github.com/matrix-org/matrix-react-sdk/pull/4459. We need
to pass both URLs as we need both the wURL (for the widget's 'identity'
ie. OpenID) and the URL that's actually in the iframe (for the
messaging).
 2020-05-13 16:10:40 +01:00
Weblate 90afd5ef9a Merge branch 'origin/develop' into Weblate. 2020-05-13 11:47:59 +00:00
David Baker ef2678db93
Merge pull request #4591 from matrix-org/dbkr/fix_persistent_widgets_desktop 
Fix persistent widgets on desktop / http
 2020-05-13 12:47:54 +01:00
David Baker 92824411e8 Fix persistent widgets on desktop / http 
WidgetMessaging needs the URL of the widget that gets rendered into
the iframe because that's where the postmessages will be coming from.

Fixes https://github.com/vector-im/riot-web/issues/13369
 2020-05-13 12:33:10 +01:00
Weblate 9d079326f3 Merge branch 'origin/develop' into Weblate. 2020-05-13 10:29:23 +00:00
J. Ryan Stinnett cda691e359 Tweak Yarn docs link post-review 2020-05-13 11:29:11 +01:00
Weblate 94953d8354 Merge branch 'origin/develop' into Weblate. 2020-05-13 10:26:48 +00:00
J. Ryan Stinnett c652d4f134
Merge pull request #4589 from chagai95/patch-2 
Updated link and added:Yarn two is not yet used.
 2020-05-13 11:26:43 +01:00
Weblate 324b663b27 Merge branch 'origin/develop' into Weblate. 2020-05-13 09:51:05 +00:00
Michael Telatynski 998b661796
Merge pull request #4578 from matrix-org/t3chguy/topic_dialog 
Fix topic dialog not supporting escape as it didn't have a "Close"
 2020-05-13 10:51:00 +01:00
Weblate f152837345 Merge branch 'origin/develop' into Weblate. 2020-05-13 09:50:44 +00:00
Michael Telatynski 77e32977dc
Merge pull request #4579 from matrix-org/t3chguy/create_room_public 
Default to public room when creating room from room directory
 2020-05-13 10:50:38 +01:00
chagai95 d68b50feb6
Updated link and added:Yarn two is not yet used. 
the link was broken and there was no mention of the version of yarn being used.
 2020-05-13 11:49:26 +02:00
Weblate 2c78eafcbd Merge branch 'origin/develop' into Weblate. 2020-05-13 08:58:24 +00:00
Kévin C be61968dca Translated using Weblate (French) 
Currently translated at 100.0% (2307 of 2307 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-05-13 08:58:24 +00:00
Priit Jõerüüt cad0f38d4d Translated using Weblate (Estonian) 
Currently translated at 45.0% (1037 of 2307 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-05-13 08:58:24 +00:00
Tirifto 1cfdf7e56f Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2307 of 2307 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-13 08:58:23 +00:00
Stanislav Lukeš 42eb36d628 Translated using Weblate (Czech) 
Currently translated at 95.2% (2197 of 2307 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-05-13 08:58:22 +00:00