Šimon Brandner
cc38bcf333
Display room name
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 15:09:21 +01: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
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
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
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
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
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
