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

30767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
20e6501366
Merge pull request #5618 from matrix-org/travis/rel-stickerpickerfix 
[Release] Fix z-index of stickerpicker
 2021-02-04 03:00:38 -07:00
Travis Ralston
bf3c27a37d Fix z-index of stickerpicker 2021-02-04 02:54:25 -07: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
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
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
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
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
Michael Telatynski
6acd80298a
Merge pull request #5606 from matrix-org/t3chguy/cherrypick/5605 
[Release] Better errors for SSO failures
 2021-02-02 14:06:55 +00:00
Michael Telatynski
10ffac9f41 i18n 2021-02-02 13:35:26 +00:00
Michael Telatynski
f8f9b4e390 Update src/Lifecycle.ts 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-02-02 13:35:26 +00:00
Michael Telatynski
bad71cf52f Better errors for SSO failures 2021-02-02 13:35:26 +00:00
Michael Telatynski
d06f61393d
Merge pull request #5603 from matrix-org/t3chguy/cherrypick/5602 
[Release] Fix RoomView re-mounting breaking peeking
 2021-02-01 13:01:04 +00:00
Michael Telatynski
077ceeb20d Fix RoomView re-mounting breaking peeking 
Because as of React 16 order of unmount & re-mount is undefined
this was causing the possibility of the unmount running after
the willMount of the replacement RoomView, upsetting the state
of the singleton inside the js-sdk.
 2021-02-01 12:29:11 +00:00
RiotRobot
7494a94908 v3.13.0-rc.1 2021-01-29 17:28:26 +00:00
RiotRobot
9bb906f5d4 Prepare changelog for v3.13.0-rc.1 2021-01-29 17:28:25 +00:00
RiotRobot
815a126b56 Upgrade matrix-js-sdk to 9.6.0-rc.1 2021-01-29 17:23:17 +00:00
J. Ryan Stinnett
b24e64f6fe
Merge pull request #5597 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Translations update from Weblate
 2021-01-29 17:14:46 +00:00
Priit Jõerüüt
34c198a2ed Translated using Weblate (Estonian) 
Currently translated at 100.0% (2739 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-01-29 17:13:00 +00:00
@a2sc:matrix.org
1715705643 Translated using Weblate (German) 
Currently translated at 100.0% (2739 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-01-29 17:12:57 +00:00
Weblate
f0a83b24df Merge branch 'origin/develop' into Weblate. 2021-01-29 16:40:42 +00:00
J. Ryan Stinnett
b39fdaae45
Merge pull request #5596 from matrix-org/jryans/hybrid-from-config 
Support managed hybrid widgets from config
 2021-01-29 16:40:36 +00:00
J. Ryan Stinnett
f8192a8314 Support managed hybrid widgets from config 
This adds additional support to the managed hybrid widget experiment to also
support pulling the build URL from Element config.
 2021-01-29 16:26:34 +00:00
Weblate
d25e13148e Merge branch 'origin/develop' into Weblate. 2021-01-29 16:03:28 +00:00
J. Ryan Stinnett
3f89da9b8f
Merge pull request #5594 from matrix-org/jryans/hybrid-call-widget 
Add managed hybrid call widgets when supported
 2021-01-29 16:03:20 +00:00
Weblate
1e8d2693f4 Merge branch 'origin/develop' into Weblate. 2021-01-29 15:49:18 +00:00
@a2sc:matrix.org
efc74b507d Translated using Weblate (German) 
Currently translated at 99.8% (2734 of 2738 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
 2021-01-29 15:49:18 +00:00
J. Ryan Stinnett
873b173025
Merge pull request #5595 from matrix-org/jryans/mobile-guide-text 
Tweak mobile guide toast copy
 2021-01-29 15:49:03 +00:00
J. Ryan Stinnett
0cb1d1dc95 Tweak mobile guide toast copy 2021-01-29 15:30:13 +00:00
J. Ryan Stinnett
2c313e0c5e Add managed hybrid call widgets when supported 
If your homeserver is configured with an experiment `widget_build_url`, this
will take over the functionality of the call buttons and turn them into a
general widget installer.
 2021-01-29 14:45:25 +00:00
Weblate
ae8a5d13e2 Merge branch 'origin/develop' into Weblate. 2021-01-29 13:29:03 +00:00
waclaw66
1819aecffd Translated using Weblate (Czech) 
Currently translated at 100.0% (2737 of 2737 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-01-29 13:29:03 +00:00
Michael Telatynski
62712159f6
Merge pull request #5578 from matrix-org/t3chguy/sso_fixes 
Improve SSO auth flow
 2021-01-29 13:28:53 +00:00
Michael Telatynski
0eb0d242d5
Apply suggestions from code review 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-01-29 13:05:09 +00:00
Michael Telatynski
0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Michael Telatynski
1eb88c988c Add tooltips to mini sso buttons 2021-01-29 12:05:15 +00:00
Michael Telatynski
2c2cf4c073 Update google branding 2021-01-29 11:42:34 +00:00
Weblate
096b13ea81 Merge branch 'origin/develop' into Weblate. 2021-01-29 11:18:16 +00:00
J. Ryan Stinnett
b8e3908ee2
Merge pull request #5586 from matrix-org/jryans/maybe-mobile 
Add optional mobile guide toast
 2021-01-29 11:18:08 +00:00
Weblate
71a0788b74 Merge branch 'origin/develop' into Weblate. 2021-01-29 10:38:24 +00:00
J. Ryan Stinnett
241955f7c2
Merge pull request #5588 from 2580ayush2580/ayush25807 
Fix invisible text after logging out in the dark theme
 2021-01-29 10:38:17 +00:00
Weblate
7698ba3bb1 Merge branch 'origin/develop' into Weblate. 2021-01-29 10:26:48 +00:00
Michael Telatynski
e839ac0f06
Merge pull request #5591 from SimonBrandner/fix-escape-to-quit-reply 
Fix escape for cancelling replies
 2021-01-29 10:26:42 +00:00
Ayush Kumar
6b56d0b987 change value #2e2f32 to -primary-color 2021-01-29 15:54:40 +05:30