OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
28,771 Commits
203 Branches
553 Tags
428 MiB
Commit Graph

28771 Commits (71e800abd1f54ebd86b2e062e54fcbea45f70b77)

Author SHA1 Message Date
RiotRobot 71e800abd1 Prepare changelog for v3.6.0 2020-10-12 13:36:52 +01:00
RiotRobot 0ac4f21652 Upgrade matrix-js-sdk to 8.5.0 2020-10-12 13:24:53 +01:00
Travis Ralston 34a0757a4c
Merge pull request #5306 from matrix-org/travis/rel/5305 
[Release] Fix templating for v1 jitsi widgets
 2020-10-09 09:34:46 -06:00
Travis Ralston 3e7f117611 Fix templating for v1 jitsi widgets 
Fixes https://github.com/vector-im/element-web/issues/15427
 2020-10-09 09:31:02 -06:00
Travis Ralston f528a161ad
Merge pull request #5304 from matrix-org/travis/rel/5303 
[Release] Use new preparing event for widget communications
 2020-10-09 08:56:24 -06:00
Travis Ralston 2caf679024 Update widget-api 2020-10-08 21:22:17 -06:00
Travis Ralston fcc411f8b9 Use new preparing event for widget communications 
Fixes https://github.com/vector-im/element-web/issues/15404

We need to make sure we don't accidentally call the widget before its ready, but we can happily show it once it is loaded/prepared.
 2020-10-08 21:21:53 -06:00
RiotRobot 4abaa107ab v3.6.0-rc.1 2020-10-07 14:30:51 +01:00
RiotRobot ffd7cddd0d Prepare changelog for v3.6.0-rc.1 2020-10-07 14:30:51 +01:00
RiotRobot 2fd9b9b3b9 Upgrade matrix-js-sdk to 8.5.0-rc.1 2020-10-07 14:23:52 +01:00
J. Ryan Stinnett 0b443c5280
Merge pull request #5297 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Update from Weblate
 2020-10-07 13:38:51 +01:00
Weblate 4965886498 Merge branch 'origin/develop' into Weblate. 2020-10-07 12:16:50 +00:00
Michael Telatynski 7205e5d2e5
Merge pull request #5295 from matrix-org/t3chguy/fix/15403 
Fix edited replies being wrongly treated as big emoji
 2020-10-07 13:16:46 +01:00
Weblate e172f71f29 Merge branch 'origin/develop' into Weblate. 2020-10-07 10:08:51 +00:00
LinAGKar 70632e8153 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
 2020-10-07 10:08:51 +00:00
Szimszon b37f6db909 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
 2020-10-07 10:08:50 +00:00
Xose M 8004b21e5e Translated using Weblate (Galician) 
Currently translated at 99.9% (2373 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-10-07 10:08:49 +00:00
Jeff Huang 88824c02d3 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-07 10:08:49 +00:00
Michael Telatynski 709d33c21c
Merge pull request #5294 from matrix-org/t3chguy/fix/w2 
Fix StopGapWidget infinitely recursing
 2020-10-07 11:08:44 +01:00
Michael Telatynski 8a226781c4 Fix edited replies being wrongly treated as big emoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 11:08:43 +01:00
Michael Telatynski 0e42fc45e2 Resolve couple of React warnings/errors 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:40:20 +01:00
Michael Telatynski 67193b0ea7 Fix StopGapWidget infinitely recursing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:39:52 +01:00
Weblate 3304dff984 Merge branch 'origin/develop' into Weblate. 2020-10-06 23:15:01 +00:00
Michael Telatynski 430bceb91d
Merge pull request #5281 from matrix-org/t3chguy/fix/9836 
Fix editing and redactions not updating the Reply Thread
 2020-10-07 00:14:56 +01:00
Weblate 99d069f7ae Merge branch 'origin/develop' into Weblate. 2020-10-06 21:59:02 +00:00
Michael Telatynski 35c7ccfcbd
Merge pull request #5282 from matrix-org/t3chguy/fix/15380 
Hide Jump to Read Receipt button for users who have not yet sent an RR
 2020-10-06 22:58:56 +01:00
Michael Telatynski 1bd0d9e02b Iterate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 22:53:34 +01:00
Michael Telatynski 2e45374cf8
Update src/components/views/right_panel/UserInfo.tsx 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-10-06 22:49:50 +01:00
Weblate cc25e98dbf Merge branch 'origin/develop' into Weblate. 2020-10-06 20:36:20 +00:00
@a2sc:matrix.org a8ec588247 Translated using Weblate (German) 
Currently translated at 99.9% (2371 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-06 20:36:20 +00:00
Travis Ralston 3fdefa354e
Merge pull request #5279 from Sorunome/soru/fix-img-rendering 
fix img tags not always being rendered correctly
 2020-10-06 14:36:14 -06:00
Weblate e4e5137071 Merge branch 'origin/develop' into Weblate. 2020-10-06 19:37:22 +00:00
David Baker 3d7358d03a
Merge pull request #5293 from matrix-org/dbkr/fix_rightpanel_crash 
Hopefully fix righhtpanel crash
 2020-10-06 20:37:17 +01:00
David Baker 0c6be6cf5e Update copyright 
As per https://github.com/matrix-org/synapse/issues/7565#issuecomment-639171606
 2020-10-06 19:32:21 +01:00
David Baker 9dc0837619 Hopefully fix righhtpanel crash 
The right panel wearns many hats, and only one of those hats comes
with a room prop, so make sure it's there.
 2020-10-06 18:11:28 +01:00
Weblate 0dc35967aa Merge branch 'origin/develop' into Weblate. 2020-10-06 13:57:52 +00:00
Nikita Epifanov 6994247aa5 Translated using Weblate (Russian) 
Currently translated at 99.9% (2371 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-10-06 13:57:52 +00:00
Priit Jõerüüt e53d314828 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2374 of 2374 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 13:57:51 +00:00
Michael Telatynski 6f5f66e255
Merge pull request #5283 from matrix-org/t3chguy/fix/w1 
Fix naive pinning limit and app tile widgetMessaging NPE
 2020-10-06 14:57:46 +01:00
Weblate 316fe0ad03 Merge branch 'origin/develop' into Weblate. 2020-10-06 11:36:02 +00:00
Priit Jõerüüt a575268ebd Translated using Weblate (Estonian) 
Currently translated at 100.0% (2372 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-06 11:36:02 +00:00
Besnik Bleta 8507480bdb Translated using Weblate (Albanian) 
Currently translated at 99.8% (2367 of 2372 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sq/
 2020-10-06 11:36:02 +00:00
Michael Telatynski 5f615bd4c9
Merge pull request #5272 from matrix-org/t3chguy/fix/15255 
Show server errors from saving profile settings
 2020-10-06 12:35:56 +01:00
Michael Telatynski 55a18b8c2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15255 
 Conflicts:
	src/components/views/settings/ProfileSettings.js
 2020-10-06 10:51:30 +01:00
Michael Telatynski 17a04f2915 Fix naive pinning limit and app tile widgetMessaging NPE 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 10:48:55 +01:00
Weblate cb090f4743 Merge branch 'origin/develop' into Weblate. 2020-10-06 09:24:30 +00:00
Michael Telatynski 39c49125ce
Merge pull request #5273 from matrix-org/t3chguy/fix/15323 
Update copy for `redact` permission
 2020-10-06 10:24:26 +01:00
Weblate c4d9edffcc Merge branch 'origin/develop' into Weblate. 2020-10-06 09:23:24 +00:00
Michael Telatynski ab9b5b0d7b
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width 
Remove width limit on widgets
 2020-10-06 10:23:19 +01:00
Michael Telatynski 0bb26831ae Hide Jump to Read Receipt button for users who have not yet sent an RR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-06 08:28:06 +01:00