mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 04:21:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
30839 commits 214 branches 561 tags 414 MiB
Commit graph

30839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
5ac9a85ac8
Merge pull request #5622 from matrix-org/t3chguy/socials2 
Improve SSO login start screen and 3pid invite handling somewhat
 2021-02-05 18:09:41 +00:00
Michael Telatynski
1d1a3e72ca Improve SSO login start screen and 3pid invite handling somewhat 2021-02-05 17:18:13 +00:00
J. Ryan Stinnett
295cf12cf8
Merge pull request #5621 from SimonBrandner/fix-jump-on-reaction 
Don't jump to bottom on reaction
 2021-02-05 14:28:25 +00:00
J. Ryan Stinnett
32310abc14
Merge pull request #5620 from matrix-org/jryans/room-topic-only 
Fix several profile settings oddities
 2021-02-05 14:25:04 +00:00
Šimon Brandner
69e81119e9
Don't jump to bottom on reaction 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-05 15:15:20 +01:00
J. Ryan Stinnett
81bd919a18 Port avatar restore to user profile settings 2021-02-05 14:11:57 +00:00
J. Ryan Stinnett
bccfdde4ac Normalise cancel behaviour for room avatar 
This normalises the behaviour of the "Cancel" button for the room profile so
that it _always_ restores the existing value for all of room name, topic, and
avatar, instead of performing a mix of restore and remove.

Fixes https://github.com/vector-im/element-web/issues/16375
 2021-02-05 13:58:28 +00:00
J. Ryan Stinnett
bffce8689a Allow saving room topic or name only 
This changes the room profile settings to support saving _only_ the room topic or
name in case you have limited access to set one but not the other.

Fixes https://github.com/vector-im/element-web/issues/16375
 2021-02-05 13:34:06 +00:00
J. Ryan Stinnett
15a4032be0
Merge pull request #5530 from aaronraimist/option-hide-stickers 
Add option to hide the stickers button in the composer
 2021-02-04 17:01:23 +00:00
J. Ryan Stinnett
4a73f3c504
Merge pull request #5598 from SimonBrandner/fix-confusing-right-panel 
Fix confusing right panel button behaviour
 2021-02-04 16:30:41 +00:00
J. Ryan Stinnett
a4318299ff
Merge pull request #5601 from weeman1337/fix-16325-timestamp-jump 
Fix jumping timestamp if hovering a message with e2e indicator bar
 2021-02-04 16:02:18 +00:00
Šimon Brandner
fdc78396fa
Replaced defaultDis and removed duplicate import 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-04 16:53:25 +01:00
J. Ryan Stinnett
a730170a5d
Merge pull request #5614 from SimonBrandner/fix-icon-position 
Fix avatar and trash alignment
 2021-02-04 15:28:11 +00:00
RiotRobot
e9740f5a69 Merge branch 'master' into develop 2021-02-04 12:05:45 +00:00
RiotRobot
0fe54deab1 v3.13.1 2021-02-04 12:04:27 +00:00
RiotRobot
2cab6f66f0 Prepare changelog for v3.13.1 2021-02-04 12:04:27 +00:00
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
5130347621
Merge pull request #5617 from matrix-org/travis/stickerpicker-zindex 
Fix z-index of stickerpicker
 2021-02-04 03:00:31 -07:00
Travis Ralston
bf3c27a37d Fix z-index of stickerpicker 2021-02-04 02:54:25 -07:00
Travis Ralston
97584af947 Fix z-index of stickerpicker 2021-02-04 02:50:54 -07: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
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
Š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