Commit Graph
32498 Commits
Author SHA1 Message Date
Michael TelatynskiandGitHub 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 StinnettandGitHub 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 StinnettandGitHub 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
Michael TelatynskiandGitHub 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 TelatynskiandJ. Ryan Stinnett 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
Weblate 8e9d840abf Merge branch 'origin/develop' into Weblate. 2021-02-02 13:34:09 +00:00
Slobodan SimićandWeblate 368228c6c1 Translated using Weblate (Serbian)
Currently translated at 47.9% (1312 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sr/
2021-02-02 13:34:09 +00:00
rkfgandWeblate 0da37ceace Translated using Weblate (Russian)
Currently translated at 98.2% (2690 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2021-02-02 13:34:08 +00:00
Michael TelatynskiandGitHub 785633b430 Merge pull request #5605 from matrix-org/t3chguy/socials-errors
Better errors for SSO failures
2021-02-02 13:33:57 +00:00
Michael Telatynski accd2492a3 i18n 2021-02-02 13:01:57 +00:00
69b2d67250 Update src/Lifecycle.ts
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-02 12:58:31 +00:00
Slobodan SimićandWeblate f0acecd83d Translated using Weblate (Serbian)
Currently translated at 47.8% (1311 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sr/
2021-02-01 19:21:25 +00:00
XoseMandWeblate 1a3d4a652e Translated using Weblate (Galician)
Currently translated at 99.9% (2737 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2021-02-01 19:21:24 +00:00
waclaw66andWeblate c7fe73e881 Translated using Weblate (Czech)
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/cs/
2021-02-01 19:21:21 +00:00
randomandWeblate 0c471d2115 Translated using Weblate (Italian)
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/it/
2021-02-01 19:21:19 +00:00
trevdenemeandWeblate c49e3a525c Translated using Weblate (Turkish)
Currently translated at 81.1% (2224 of 2739 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/tr/
2021-02-01 19:21:16 +00:00
Jeff HuangandWeblate c5d08b47bd Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2021-02-01 19:21:13 +00:00
LinAGKarandWeblate 6ff8bea11f Translated using Weblate (Swedish)
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/sv/
2021-02-01 19:21:11 +00:00
Michael Telatynski 5d86c2f8e0 Better errors for SSO failures 2021-02-01 16:42:58 +00:00
Šimon Brandner 022781e9bc Added a comment about updating thumbnails
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 16:03:20 +01:00
Šimon Brandner 28ff4e6955 Move DesktopCapturerSource
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-01 15:53:53 +01:00
J. Ryan StinnettandGitHub 132057d4a7 Merge pull request #5549 from 2580ayush2580/ayush2580
Increase language search bar width
2021-02-01 13:50:42 +00:00
J. Ryan StinnettandGitHub 799753d2b2 Merge pull request #5565 from SimonBrandner/fix-13090
Scroll to bottom on message_sent
2021-02-01 13:04:38 +00:00
J. Ryan StinnettandGitHub a32495ba9e Merge pull request #5587 from dangwynne/develop
Fix new rooms being titled 'Empty Room'
2021-02-01 13:01:38 +00:00
Michael TelatynskiandGitHub 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 TelatynskiandGitHub 741b3f76ee Merge pull request #5593 from SimonBrandner/fix-collapsing-of-left-panel
Fix saving the collapsed state of the left panel
2021-02-01 12:50:37 +00:00
Michael TelatynskiandGitHub 5a49cbf51a Merge pull request #5600 from weeman1337/fix-e2et-run-out
Fix app-url hint in the e2e-test run script output
2021-02-01 12:47:12 +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
Michael TelatynskiandGitHub 72263a4a56 Merge pull request #5602 from matrix-org/t3chguy/peeking
Fix RoomView re-mounting breaking peeking
2021-02-01 12:26:42 +00:00
J. Ryan StinnettandGitHub 50452d52ff Merge pull request #5592 from matrix-org/jryans/opt-room-id
Tweak a few room ID checks
2021-02-01 10:54:29 +00:00
J. Ryan StinnettandGitHub 89b835dd20 Merge pull request #5575 from matrix-org/jryans/no-event-pills
Remove pills from event permalinks with text
2021-02-01 10:53:22 +00:00
Michael Telatynski 53334de5a9 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-01-31 16:09:11 +00:00
Michael Weimann 9b54aba4c0 fix timestamp width if there is a 2e2 indicator bar
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-01-31 11:11:34 +01:00
Michael Weimann 0660371461 fix typo in end-to-end-test run script output
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-01-31 09:53:15 +01:00
Šimon Brandner 8a50b7bcbb Properly handle closing encryption panel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 10:22:11 +01:00
Šimon Brandner 73ab074219 Properly handle closing the panel while verifying
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 10:22:04 +01:00
Šimon Brandner 1360f551ce Back button should send you to member info
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 08:54:08 +01:00