Commit Graph

30903 Commits (c77f0bcfa452ac5e808b211d215e273e0e952295)

Author SHA1 Message Date
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
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
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
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
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 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
Michael Telatynski 69b2d67250
Update src/Lifecycle.ts
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-02 12:58:31 +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 Stinnett 132057d4a7
Merge pull request #5549 from 2580ayush2580/ayush2580
Increase language search bar width
2021-02-01 13:50:42 +00:00
J. Ryan Stinnett 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 Stinnett a32495ba9e
Merge pull request #5587 from dangwynne/develop
Fix new rooms being titled 'Empty Room'
2021-02-01 13:01:38 +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 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 Telatynski 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 Telatynski 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 Stinnett 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 Stinnett 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
Šimon Brandner 4cf03e4c10
Added optional refireParams
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 08:51:26 +01:00
Šimon Brandner eee6a509c7
Close button should always close the panel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-30 08:04:25 +01:00