dangwynne
c1823e2e5a
Close current modal when session is logged out
2021-02-03 22:31:28 +00:00
Jason Robinson
6ccce7142c
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-03 22:35:22 +02:00
Šimon Brandner
b73227eaca
Merge branch 'develop' into fix-icon-position
2021-02-03 18:46:45 +01:00
Šimon Brandner
b8ee23cdf4
Make consistent for all events
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 18:41:09 +01:00
Weblate
3986c0556b
Merge branch 'origin/develop' into Weblate.
2021-02-03 16:30:56 +00:00
J. Ryan Stinnett
7489011ab7
Merge pull request #5615 from matrix-org/jryans/pill-room-via
...
Fix permalink via parsing for rooms
2021-02-03 16:30:48 +00:00
J. Ryan Stinnett
474c029db5
Fix permalink via parsing for rooms
...
This adjusts the app local link parsing path to better handle `via`s in query
params. Previously this path only expected them when an event ID was also
present, but it's also valid to have `via`s without event IDs as well.
Fixes https://github.com/vector-im/element-web/issues/16345
2021-02-03 15:18:19 +00:00
J. Ryan Stinnett
fd7c50f683
Move route splitting inside route parsing
2021-02-03 14:05:22 +00:00
Weblate
94c522440b
Merge branch 'origin/develop' into Weblate.
2021-02-03 12:11:45 +00:00
RiotRobot
bd538823cf
Reset matrix-js-sdk back to develop branch
2021-02-03 12:11:07 +00:00
RiotRobot
9840ac6f17
Resetting package fields for development
2021-02-03 12:10:42 +00:00
RiotRobot
b770d8d214
Merge branch 'master' into develop
2021-02-03 12:10:13 +00:00
RiotRobot
11f80be0f7
v3.13.0
2021-02-03 12:07:42 +00:00
RiotRobot
379c485ff8
Prepare changelog for v3.13.0
2021-02-03 12:07:41 +00:00
RiotRobot
41c18d0d24
Upgrade matrix-js-sdk to 9.6.0
2021-02-03 12:02:50 +00:00
Weblate
f190d1d353
Merge branch 'origin/develop' into Weblate.
2021-02-03 10:54:17 +00:00
XoseM
755f68162c
Translated using Weblate (Galician)
...
Currently translated at 100.0% (2744 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-02-03 10:54:17 +00:00
waclaw66
e2c220f493
Translated using Weblate (Czech)
...
Currently translated at 100.0% (2744 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-02-03 10:54:14 +00:00
Ihor Hordiichuk
5d1eabe3d4
Translated using Weblate (Ukrainian)
...
Currently translated at 53.6% (1471 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2021-02-03 10:54:12 +00:00
Jeff Huang
4edd54a5b6
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2744 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-02-03 10:54:10 +00:00
Szimszon
3e1424effe
Translated using Weblate (Hungarian)
...
Currently translated at 99.9% (2743 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-02-03 10:54:08 +00:00
J. Ryan Stinnett
00059c49ab
Merge pull request #5613 from 2580ayush2580/ayush25809
...
Fix "Terms and Conditions" checkbox alignment
2021-02-03 10:53:58 +00:00
Šimon Brandner
9a131efc1a
Fix avatar alignment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 08:16:07 +01:00
Šimon Brandner
eee9cf153b
Fix trash alignment
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-03 08:15:59 +01:00
Ayush Kumar
af0b009600
Fix term_policy aligned to the center
2021-02-03 00:05:55 +05:30
Weblate
1f423e10a2
Merge branch 'origin/develop' into Weblate.
2021-02-02 18:10:10 +00:00
Travis Ralston
c64d158183
Merge pull request #5611 from matrix-org/jryans/flair-height
...
Fix flair height after accent changes
2021-02-02 11:10:02 -07:00
Travis Ralston
560a7192cd
Merge pull request #5612 from matrix-org/jryans/flair-height-release
...
[Release] Fix flair height after accent changes
2021-02-02 11:09:58 -07:00
J. Ryan Stinnett
4136a62be2
Fix flair height after accent changes
...
The accent changes in https://github.com/matrix-org/matrix-react-sdk/pull/5569
led to a regression in flair display where the bottom edge was clipped.
Fixes https://github.com/vector-im/element-web/issues/16350
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5569
2021-02-02 18:00:23 +00:00
J. Ryan Stinnett
388e23b40b
Fix flair height after accent changes
...
The accent changes in https://github.com/matrix-org/matrix-react-sdk/pull/5569
led to a regression in flair display where the bottom edge was clipped.
Fixes https://github.com/vector-im/element-web/issues/16350
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5569
2021-02-02 17:57:22 +00:00
Weblate
2972e7b0d1
Merge branch 'origin/develop' into Weblate.
2021-02-02 17:40:57 +00:00
Priit Jõerüüt
328eafc3a7
Translated using Weblate (Estonian)
...
Currently translated at 100.0% (2744 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-02-02 17:40:57 +00:00
Besnik Bleta
d05efa9f2d
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2736 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-02-02 17:40:55 +00:00
Tim Al
5f51408a8f
Translated using Weblate (Dutch)
...
Currently translated at 77.5% (2129 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-02-02 17:40:51 +00:00
Szimszon
e54c683b28
Translated using Weblate (Hungarian)
...
Currently translated at 99.7% (2738 of 2744 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-02-02 17:40:48 +00:00
Michael Telatynski
6eee6cf8cb
Merge pull request #5610 from matrix-org/t3chguy/cherrypick/5609
...
[Release] Iterate Social Logins work around edge cases and branding
2021-02-02 17:40:41 +00:00
Michael Telatynski
45776a4144
Merge pull request #5609 from matrix-org/t3chguy/social-branding
...
Iterate Social Logins work around edge cases and branding
2021-02-02 17:40:37 +00:00
Michael Telatynski
b83de3301b
Update SSO Twitter social branding to match guidelines
2021-02-02 17:32:05 +00:00
Michael Telatynski
842fe36c7e
Fix register exploding if the server is down or we just don't have flows
2021-02-02 17:32:05 +00:00
Michael Telatynski
f383c42be3
Update SSO Facebook social branding to match guidelines
2021-02-02 17:32:05 +00:00
Michael Telatynski
0e94d08d9a
Update SSO Twitter social branding to match guidelines
2021-02-02 17:29:19 +00:00
Michael Telatynski
3e3a88116d
Fix register exploding if the server is down or we just don't have flows
2021-02-02 17:28:52 +00:00
Michael Telatynski
1ba0999915
Update SSO Facebook social branding to match guidelines
2021-02-02 17:19:18 +00:00
J. Ryan Stinnett
838bbdec9d
Merge pull request #5608 from matrix-org/jryans/tally-ho-release
...
[Release] Lock widget room ID when added
2021-02-02 15:27:05 +00:00
J. Ryan Stinnett
ad2a187566
Upgrade matrix-widget-api
2021-02-02 15:16:43 +00:00
J. Ryan Stinnett
14f9a529b8
Lock widget room ID when added
...
This changes the widget room ID available to widget URL templates so that it's
locked to the room the widget was added in.
Fixes https://github.com/vector-im/element-web/issues/16337
2021-02-02 15:15:26 +00:00
Weblate
c14985398f
Merge branch 'origin/develop' into Weblate.
2021-02-02 15:03:17 +00:00
J. Ryan Stinnett
ecc3dbbd80
Merge pull request #5607 from matrix-org/jryans/tally-ho
...
Lock widget room ID when added
2021-02-02 15:03:09 +00:00
J. Ryan Stinnett
f53e703993
Upgrade matrix-widget-api
2021-02-02 14:42:10 +00:00
J. Ryan Stinnett
e4629878bc
Lock widget room ID when added
...
This changes the widget room ID available to widget URL templates so that it's
locked to the room the widget was added in.
Fixes https://github.com/vector-im/element-web/issues/16337
2021-02-02 14:36:44 +00:00