mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-24 02:05:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
32706 commits 203 branches 553 tags 406 MiB
Commit graph

2774 commits

Author SHA1 Message Date
Travis Ralston
52c73a7a58 Add developer tool to explore and edit settings 2021-02-18 14:56:19 -07:00
Šimon Brandner
5de99c7708
Fix licenses 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-18 19:40:24 +01:00
Šimon Brandner
bd0e5446c5
Merge branch 'develop' into feature-multi-language-spell-check 2021-02-18 18:16:16 +01:00
J. Ryan Stinnett
5c1b38a48c
Merge pull request #5637 from williamkray/wreck/clean-thumbnail-changes 
Improve URL preview formatting and image upload thumbnail size
 2021-02-17 11:37:37 +00:00
J. Ryan Stinnett
ec4a39a694
Merge pull request #5641 from SimonBrandner/fix-rounded-resize 
Fix border radius when the panel is collapsed
 2021-02-17 11:12:03 +00:00
J. Ryan Stinnett
d96043d5ab Use config for host signup branding 2021-02-15 17:37:33 +00:00
Jaiwanth
04d2bf1d6a Check whether user has permission to invite 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 20:55:15 +05:30
Jaiwanth
f420c85985 Added invite option to room's context menu 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-02-15 19:21:26 +05:30
Šimon Brandner
7dc6029f19
Move icons 
This tweaks the icon positions to look a bit better. Espacially with a scrollbar on the side

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-13 15:29:38 +01:00
Šimon Brandner
8afb74d0e1
Fix border radius when the panel is collapsed 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-13 08:53:25 +01:00
Šimon Brandner
3983c15302
Delint 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 17:11:24 +01:00
Šimon Brandner
130e4f7bfd
Added some styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-12 17:06:02 +01:00
Šimon Brandner
2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
J. Ryan Stinnett
a87e637666
Merge pull request #5630 from SimonBrandner/tweak-codeblock-colors 
Fix codeblock scrollbar colors
 2021-02-11 12:41:12 +00:00
Jason Robinson
538272a827 Tweak the dialog dimensions 
Make height/width max (as per design wish) and
actual based on viewport.
 2021-02-10 15:13:01 +02:00
Jason Robinson
23140a84ff Remove host signup config strings, make translatable instead 
Also replace the icon in the UserMenu and change the text, requested from design.
 2021-02-10 13:38:32 +02:00
Jason Robinson
c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson
3ed6f1fe5d Fix maximise and minimise icon references 2021-02-09 12:22:58 +02:00
Jason Robinson
5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
Šimon Brandner
e2bf0c84d7
Move icons to the left 
We do this because they would otherwise collide with the scrollbar

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-09 08:16:36 +01:00
William Kray
fec2309451 move cancel button to the right 2021-02-08 09:26:10 -08:00
William Kray
e6da146b21 pad url preview close button a bit 2021-02-08 09:26:10 -08:00
William Kray
9260b031e9 oops missed a semicolon 2021-02-08 09:26:10 -08:00
William Kray
03c30b0338 change link previews to vertical flow 2021-02-08 09:26:10 -08:00
William Kray
e72a7567f7 drop video preview max-height to 300px 2021-02-08 09:25:08 -08:00
J. Ryan Stinnett
6d9da1bad2
Merge pull request #5625 from SimonBrandner/fix-notif-jumpy-ui 
Fix jumpy notifications settings UI
 2021-02-08 15:10:27 +00:00
Šimon Brandner
3b6790fbf1
Merge branch 'develop' into fix-notif-jumpy-ui 2021-02-08 15:42:06 +01:00
Šimon Brandner
c4a3906871
Fix positioning of spinner in a smarter way 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:38:43 +01:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +01:00
Šimon Brandner
257b8819b3
Change icon size 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:30 +01:00
Šimon Brandner
cdb0d1c12e
Move and use icons from widget dir 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-08 15:22:10 +01:00
David Baker
cf5ec7720c
Merge pull request #5525 from SimonBrandner/fix-screen-sharing 
Fix desktop Matrix screen sharing and add a screen/window picker
 2021-02-08 13:54:51 +00:00
J. Ryan Stinnett
5abced7049
Merge pull request #5551 from weeman1337/fix-15347-explore-rooms-spacing 
Switch room explorer list to CSS grid
 2021-02-08 11:18:01 +00:00
Šimon Brandner
4a282759c3
Fixed jumpy UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-02-06 16:38:07 +01:00
Michael Weimann
f0f6e4678e
switch room explorer list to css grid 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2021-02-06 14:40:16 +01:00
Jason Robinson
03fe0f1f17 s not z 2021-02-04 23:17:48 +02:00
Jason Robinson
f5f8050172 Add minimize button to HostSignupDialog.tsx 2021-02-04 23:09:58 +02:00
Jason Robinson
b50ac0c096 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-04 18:32:16 +02: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
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02: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
Š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
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
b83de3301b Update SSO Twitter social branding to match guidelines 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
1ba0999915 Update SSO Facebook social branding to match guidelines 2021-02-02 17:19:18 +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
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 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
0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Michael Telatynski
2c2cf4c073 Update google branding 2021-01-29 11:42:34 +00:00
Ayush Kumar
6b56d0b987 change value #2e2f32 to -primary-color 2021-01-29 15:54:40 +05:30
Ayush Kumar
512ac5ef3b fixed invisible text after logging out in the dark theme 2021-01-29 03:58:05 +05:30
Ayush Kumar
d006c521c2 solved style-lint errors 2021-01-28 23:49:13 +05:30
Ayush Kumar
6031e34fbe fix language dropdown to center 2021-01-28 23:07:59 +05:30
J. Ryan Stinnett
5758cd8bcc
Merge pull request #5518 from blattersturm/pr/irc-layout-width 
Don't use name width in reply thread for IRC layout
 2021-01-28 12:44:36 +00:00
J. Ryan Stinnett
6cbff674d3
Merge pull request #5569 from SimonBrandner/fix-czech-letters 
Fix Czech capital letters like ŠČŘ...
 2021-01-28 12:35:22 +00:00
Michael Telatynski
34ae766893 Wire up MSC2858 brand attribute 
For better brand adherance.
Also removes old support for https IdP icons.
 2021-01-27 16:15:47 +00:00
J. Ryan Stinnett
d78bc98521 Resolve linting errors after upgrades 2021-01-27 12:42:39 +00:00
Šimon Brandner
4e438be433
Fixed Czech capital letters 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-24 17:40:19 +01:00
Šimon Brandner
90ad3360b6
Fixed read receipts? 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-24 09:15:11 +01:00
Šimon Brandner
e2abbf9a7c
Merge branch 'develop' into improve-image-view 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-23 08:12:32 +01:00
Michael Telatynski
bb50cd56ee
Merge pull request #5558 from matrix-org/t3hcguy/socialloginfixup 
Improve styling of SSO Buttons for multiple IdPs
 2021-01-22 10:37:46 +00:00
J. Ryan Stinnett
35bee5c5ea
Merge pull request #5522 from SimonBrandner/room-dialog-fixes 
Fixes for the general tab in the room dialog
 2021-01-22 10:34:37 +00:00
blattersturm
da7f6c7eca Don't use name width in reply thread for IRC layout 
Signed-off-by: Robert Dash <peachypies@protonmail.ch>
 2021-01-21 19:39:19 +01:00
Šimon Brandner
5ca9e8d323
Remove spaces 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 18:18:07 +01:00
Šimon Brandner
f1a3240ec3
Merge branch 'develop' into improve-codeblock 2021-01-21 17:36:22 +01:00
Travis Ralston
f52405de38
Merge pull request #5557 from matrix-org/travis/fix-widget-resizing 
Give a bigger target area to AppsDrawer vertical resizer
 2021-01-21 07:17:29 -07:00
J. Ryan Stinnett
14556de3d5
Merge pull request #5493 from SimonBrandner/fix-left-panel-alignment 
Fix minimized left panel avatar alignment
 2021-01-21 13:37:36 +00:00
Michael Telatynski
928ddeb718 Improve styling of SSO Buttons for multiple IdPs 2021-01-21 13:33:25 +00:00
Šimon Brandner
bd2423a52c
Added line numbering 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-21 10:53:18 +01:00
Travis Ralston
c7c055dd98 Give a bigger target area to AppsDrawer vertical resizer 
The existing target was too hard to hit, which annoyed users. This change makes it the same sort of surface area as the horizontal resizers, as requested by design to fix the problem in the short term.
 2021-01-20 15:05:18 -07:00
Šimon Brandner
14bf169631
Handle small codeblocks 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 15:01:23 +01:00
Šimon Brandner
19be3293e0
Remove commented code 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-20 13:06:08 +01:00
Šimon Brandner
58b2c18cf5
This somehow works 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 21:02:39 +01:00
Šimon Brandner
e6ab47ff76
Fix bug 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 17:30:02 +01:00
Šimon Brandner
61281a855c
Redo expanding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-19 16:35:32 +01:00
Šimon Brandner
8a4af2f348
Merge branch 'develop' into expand-codeblock 2021-01-18 17:54:06 +01:00
Šimon Brandner
49dce58027
Added expanding based on the option 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-18 17:49:09 +01:00
Will Hunt
d71b2cf04f Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-18 11:36:46 +00:00
Ayush Kumar
2c8aaa27dd Increase width of language dropdown 2021-01-17 18:50:33 +05:30
Jason Robinson
3901cd9c72 WIP 2021-01-15 17:02:28 +02:00
Jason Robinson
158036ccf9 Merge remote-tracking branch 'origin/develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-01-15 16:12:53 +02:00
Jason Robinson
90a1c5a267 WIP 2021-01-15 15:57:14 +02:00
Jason Robinson
e80dba9414 WIP 2021-01-15 15:32:30 +02:00
Jason Robinson
d4a58bdb2a WIP minimize 2021-01-14 11:53:20 +02:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01:00
David Baker
d4470d2ed2 Actually this is right colour 2021-01-13 16:55:38 +00:00
David Baker
150e8c9d56 Fix incoming call box on dark theme 2021-01-13 15:31:26 +00:00
David Baker
e2111d9161
Merge pull request #5532 from matrix-org/dbkr/dtmf 
Add in-call dialpad for DTMF sending
 2021-01-13 13:07:27 +00:00
Jason Robinson
3da5049dc7 WIP minimize 2021-01-12 17:08:42 +02:00
Jason Robinson
e6605441aa WIP minimize 2021-01-12 14:08:09 +02:00
Michael Telatynski
1c3adbc545
Merge pull request #5526 from matrix-org/t3chguy/fix/15832 
Fix avatar upload prompt/tooltip floating wrong and permissions
 2021-01-11 16:48:17 +00:00
Jason Robinson
e8c716f33e First stage of host signup flow now sits here 
Need to make things configurable, image and text for the first step should be configurable.

Also missing privacy related words, though they should be configurable too.
 2021-01-11 15:47:21 +02:00
Jason Robinson
2b98f14242 Merge branch 'develop' into jaywink/hosting-provider-iframe 2021-01-11 11:16:03 +02:00
Šimon Brandner
263f213650
Remove an empty line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:27:02 +01:00
Šimon Brandner
4538274e74
Added send message icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:25:29 +01:00
Šimon Brandner
d589c61000
Added send message button 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-09 09:09:14 +01:00
Will Hunt
000a69765c Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-08 18:03:36 +00:00
Šimon Brandner
b1010189be
Tabbed copyright link 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:33 +01:00
Šimon Brandner
640e6d68b3
Merge branch 'develop' into fix-screen-sharing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:41:06 +01:00
Šimon Brandner
bb7e76f69e
Hopefully fixed copyrights 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 20:36:54 +01:00
Šimon Brandner
8652c2e653
Fixed class names 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-01-05 19:49:09 +01:00
Jason Robinson
5f84371038 Update some copyrights 2021-01-05 14:29:48 +02:00
David Baker
4b43929aa3 Add in-call dialpad for DTMF sending 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1573
 2021-01-04 20:01:43 +00:00
Jason Robinson
bb53ae8038 Rename Element Pro -> Host Signup 2021-01-04 16:05:49 +02:00
Jason Robinson
6843737a33 Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-12-28 11:22:05 +02:00
Jason Robinson
7a358b1ca3 Rename components to be less EMS specific 2020-12-28 11:21:42 +02:00
Šimon Brandner
95d93d143e
Clean up the SCSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-28 08:38:29 +01:00
Michael Telatynski
8ee65258be Unfloat the MiniAvatarUploader "tooltip" 2020-12-27 21:13:01 +00:00
Šimon Brandner
eff26600e8
Linting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 18:33:23 +01:00
Šimon Brandner
675ca58eef
Improve UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 16:56:25 +01:00
Šimon Brandner
eae3c1c496
Get screen-sharing working, somehow 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-26 08:32:51 +01:00
David Baker
452fbb076b Add a dialpad UI for PSTN lookup 
Queries the homeserver for PSTN protocol support, and if found,
the add-room button on the DM rooms list section opens a context
menu instead with a 'dial pad' option as well as the current 'start chat'
dialog. Entering a number into this and pressing dial performs
a thirdparty user query for the given string and starts a DM with that
user.
 2020-12-23 19:02:01 +00:00
Šimon Brandner
ffe2727cf7 Fixed topic field resizing 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-22 09:40:39 +01:00
Šimon Brandner
743b91d7a1 Merge branch 'develop' into improve-image-view 2020-12-21 20:32:28 +01:00
David Baker
0d4b2f48dc Probably better to just remove this 2020-12-21 11:25:04 +00:00
Šimon Brandner
6315c8ecef Fix formatting 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:45:33 +01:00
Šimon Brandner
0dff150bb2 Fix some more sizing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:18:21 +01:00
Šimon Brandner
cbfa6c5f94 Fix some sizing issues 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 20:15:25 +01:00
Šimon Brandner
6758734593 Remove panel element 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 19:48:24 +01:00
Šimon Brandner
7dd7aeffed Remove imageBox 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 18:19:11 +01:00
Šimon Brandner
f9884b1cc7 Implement translation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 17:40:16 +01:00
Šimon Brandner
8de019c054 Added some padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 12:16:05 +01:00
Šimon Brandner
be9b68a4dd Use height and width properties for scaling again 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-20 10:07:03 +01:00
Šimon Brandner
ae25ff8216 Switched to scale 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 15:54:26 +01:00
Šimon Brandner
633221f012 Center image 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 13:50:21 +01:00
Šimon Brandner
b9f480a825 Remove flex property 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 13:13:34 +01:00
Šimon Brandner
8aabe1f330 Reorganized elements 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-19 09:26:09 +01:00
David Baker
aee861956c Remove secondary call avatar 
and change 'paused' to 'on hold'
 2020-12-18 19:40:57 +00:00
David Baker
63e99ecf93 Visual fixups for call UI 
* Add bottom margin on PiP view
 * Remove avatar blurring & pause icon for held calls
 * Change background of incoming call box to match PiP view
 * Put drop shadow & border radius on PiP view & incoming call box
   rather than the CallContainer they're in (so they each have their own
   drop shadow / rounded corners).
 * Add margin between incoming call box and PiP view
 2020-12-18 18:08:04 +00:00
Šimon Brandner
bebbb3b90e Merge branch 'develop' into improve-file-drop-ui 2020-12-17 20:22:48 +01:00
Šimon Brandner
044e02b06a Remove spaces in empty line 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-17 20:16:53 +01:00
Šimon Brandner
dcb30b72b0 Fix left panel resizer 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-17 13:25:22 +01:00
Michael Telatynski
37e3c2a23a
Merge pull request #5501 from matrix-org/t3chguy/fix/15936 
Fix padding in confirmation email registration prompt
 2020-12-17 12:05:37 +00:00
Michael Telatynski
c498609f79 Fix padding in confirmation email registration prompt 2020-12-17 10:47:03 +00:00
Michael Telatynski
f2214c0367 Fix room list help prompt alignment 2020-12-17 10:43:53 +00:00
Šimon Brandner
da97d18332 Added a comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-16 21:33:05 +01:00
Šimon Brandner
41e2ffdf0d Added background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-16 19:51:49 +01:00
Šimon Brandner
89bc443594 Fix file drop UI 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-16 16:02:27 +01:00
Jason Robinson
5aa24b97cd Merge remote-tracking branch 'origin/develop' into jaywink/elementPro 2020-12-16 14:45:16 +02:00
Šimon Brandner
e55ec43595 Fix minimized left panel alignment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2020-12-15 14:45:10 +01:00
Miroslav Šedivý
018743a639
Update _MemberList.scss 2020-12-15 11:45:15 +01:00
Jason Robinson
26d0e7797c Fix ordering 2020-12-15 10:55:24 +02:00
Jason Robinson
db370f218e Rename also _HostingSignupDialog.scss 2020-12-15 10:53:59 +02:00
Jason Robinson
cd836be809 Rename everything HostingSignup -> EMSElementPro 
This setup flow ended up quite specific due to all the various moving parts.
 2020-12-15 10:50:38 +02:00
Will Hunt
8d203043d4 Remove hide/show behaviour 2020-12-14 12:59:59 +00:00
David Baker
89240b84fb Only want margins on the large view 2020-12-10 15:52:03 +00:00
David Baker
5282c6bbe8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 12:36:11 +00:00
David Baker
f987908d04
Merge pull request #5446 from matrix-org/dbkr/hold_ui 
Add UI for hold functionality
 2020-12-10 12:30:59 +00:00
J. Ryan Stinnett
083fecbddb
Merge pull request #5411 from aaronraimist/searchbox-fix-width 
Allow SearchBox to expand to fill width
 2020-12-09 20:14:02 +00:00
Aaron Raimist
918326631f
fix lint 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-08 14:35:05 -06:00
David Baker
8f24656603 Make margins & header font match widgets 2020-12-08 19:26:57 +00:00
David Baker
70964e43f6 Fix font weights in hold text 2020-12-08 19:05:58 +00:00
Michael Telatynski
d77c5b46eb Fix width of underline in server picker dialog 2020-12-08 11:56:42 +00:00
David Baker
b9d70cb1a3 Fix indentation 2020-12-07 18:40:29 +00:00
David Baker
365d6982ce Add secondary call avatar to main voice content view 2020-12-07 18:28:43 +00:00
David Baker
8a58c9dea0 Update UI for two calls in the PiP view 
and also merge hold_ui changes
 2020-12-07 17:56:36 +00:00
David Baker
747d743bd0 Add 60% opacity black over the avatars when on hold 2020-12-07 16:22:57 +00:00
David Baker
3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
David Baker
c7f1d97b1a Round off the sharp corners 
Before you have someone's eye out
 2020-12-07 15:38:55 +00:00
Aaron Raimist
32f7e3552c
Remove globally defined flex and set just for group queries 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-12-05 21:56:17 -06:00
Aaron Raimist
3ec9d93cb0 Merge branch 'develop' into searchbox-fix-width 2020-12-05 19:53:08 -06:00
David Baker
ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker
6916b5d7c6 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-03 17:57:22 +00:00
David Baker
0b15ab06d8 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-03 17:56:39 +00:00
David Baker
1ce63f0fa7 Line 1 / 2 Support 
Support one active call plus one call on hold
 2020-12-03 17:45:49 +00:00
Šimon Brandner
19d9ea3477 Merge branch 'develop' into feature-multi-language-spell-check 2020-12-03 12:06:43 +01:00
Michael Telatynski
3fda7e3f46 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-02 15:08:13 +00:00
David Baker
4a503fb32e Fix VoIP call plinth on dark theme 
Fixes https://github.com/vector-im/element-web/issues/15873
 2020-12-02 12:14:41 +00:00
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 
 Conflicts:
	src/i18n/strings/en_EN.json
 2020-12-01 16:33:29 +00:00
David Baker
31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
David Baker
4ca35fabef Visual tweaks 2020-12-01 13:44:24 +00:00
Šimon Brandner
7609f2004e Added newline to end 2020-11-29 13:22:50 +01:00
Šimon Brandner
8f40cd39fd Added styling 2020-11-29 12:29:05 +01:00
Travis Ralston
ced68a6fbc
Merge pull request #5447 from matrix-org/travis/fix-stickerpicker 
Fix the stickerpicker
 2020-11-27 07:06:35 -07:00
Jason Robinson
5ad9b83870 Fix copyright strings 2020-11-27 15:10:35 +02:00
Jason Robinson
c818a719bf Try a slightly larger HostingSignupDialog 
Make HostingSignupBaseDialog larger
 2020-11-27 15:10:35 +02:00
Richard Lewis
116f109a62 Improve setup initiation link 2020-11-27 15:10:35 +02:00
Jason Robinson
bdab1faf16 Fix hosting signup dialog height 2020-11-27 15:10:35 +02:00
Jason Robinson
b3b3f5ebeb Fix HostingSignupDialog layouting inside dialog 2020-11-27 15:10:35 +02:00
Jason Robinson
c7706ac3d5 Add possibility for hosting provider IFrame 
Add config option hosting_signup_iframe that
will render an action in the UserMenu and ProfileSettings
for setting up a host with some hosting provider
that provides an HTML to do that.

Add iframe for hosting provider signup content
 2020-11-27 15:10:35 +02:00
Michael Telatynski
edd5bf5842
Merge pull request #5421 from matrix-org/t3chguy/fix/15700 
Simplify UserMenu for Guests as they can't use most of the options
 2020-11-27 10:57:54 +00:00
Travis Ralston
f2bc3db8fd Fix visual gap of sticker picker at bottom 
Fixes https://github.com/vector-im/element-web/issues/15690
 2020-11-26 15:09:44 -07:00
David Baker
2a02e57a95 Add UI for hold functionality 2020-11-26 14:35:09 +00:00
Michael Telatynski
1b1c482f9c Iterate tests 2020-11-25 10:22:16 +00:00
Michael Telatynski
758b47c64d Replace *ServerConfig and SignInToText with ServerPicker 2020-11-25 09:46:56 +00:00
Michael Telatynski
2f64160a0e Remove backwards compatibility in ServerConfig for m.require_identity_server 2020-11-25 09:00:31 +00:00
Michael Telatynski
f7d7182dc9 Iterate Multi-SSO support 2020-11-24 12:09:11 +00:00
Michael Telatynski
b1ca1eb3f5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-11-24 11:30:51 +00:00
Michael Telatynski
1d53a5cf23 Initial support for MSC2858 2020-11-24 11:18:11 +00:00
Michael Telatynski
613710b75c Iterate Auth copy 2020-11-23 17:01:35 +00:00
David Baker
f0fdfd53d2
Merge pull request #5432 from matrix-org/dbkr/new_look_callview 
New Look in-Call View
 2020-11-23 15:51:09 +00:00
David Baker
729d59160d Rename buttons in CSS & remove unused 2020-11-23 15:27:37 +00:00
David Baker
576ba21210 Comment nonzero opacity 2020-11-23 15:13:19 +00:00
Michael Telatynski
2263280035 Improve no email warning during registration 2020-11-23 10:25:46 +00:00
Travis Ralston
5f47077a30
Merge pull request #5385 from matrix-org/travis/msc-send-widget-events 
Add new widget API actions for changing rooms and sending/receiving events
 2020-11-20 09:17:18 -07:00
Travis Ralston
c80b0aff7d Appease the linter 2020-11-19 12:09:57 -07:00
Travis Ralston
0104164d51 Approximate the design as proposed 2020-11-19 12:06:24 -07:00
David Baker
49bd66c377 Change fullscreen button to expand button in PIP view 
and fix call controls which didn't appear in video call
 2020-11-19 16:36:23 +00:00
David Baker
50965e41eb Remove call bar 
Also hide video mute button on voice calls (awaiting clarification from design)
and fix mute keyboard shortcuts by moving them out of roomview & into
callview.
 2020-11-19 15:15:31 +00:00
Michael Telatynski
44649ca372
Merge pull request #5333 from resynth1943/add-border-radius-for-video 
Add border-radius for video
 2020-11-19 11:00:07 +00:00
Travis Ralston
55592d365c Merge branch 'develop' into travis/msc-send-widget-events 2020-11-18 15:57:53 -07:00
Travis Ralston
c62c0190c3 Merge branch 'develop' into patch-1 2020-11-18 15:31:39 -07:00
David Baker
41e885dd67 Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview 2020-11-18 14:28:03 +00:00
David Baker
a2d58e2f1f Make new in-call UI work 
* Buttons on the main view will disappear after 1 second of the user
not moving the mouse over the call view.
 * PIP view has no buttons, and not moveable yet
 * No call status in room view yet
 * Room status bar is still there currently
 2020-11-18 14:22:38 +00:00
Michael Telatynski
3ee25dadd4 Shrink new room intro top margin to half for encryption bubble tile 2020-11-18 13:09:43 +00:00
Michael Telatynski
9b2143742a
Merge pull request #5418 from matrix-org/t3chguy/fix/muggle-hustle 
Small delight tweaks to improve rough corners in the app
 2020-11-18 10:07:31 +00:00
Travis Ralston
a212dab84c Developer design a permissions dialog 2020-11-17 20:38:59 -07:00
Michael Telatynski
e05fcc8d34
Merge pull request #5408 from matrix-org/t3chguy/fix/15400 
Update styling of the Analytics toast
 2020-11-17 15:35:20 +00:00
David Baker
6caca97942 lint 2020-11-12 18:12:38 +00:00
David Baker
c921567831 WIP: the new call views work now 
just need to add the buttons and then get rid of the status bar
 2020-11-12 18:09:56 +00:00
Michael Telatynski
5f23c9499c Simplify UserMenu for Guests as they can't use most of the options 2020-11-12 12:46:55 +00:00
Michael Telatynski
f1121c1b6e Fix vertical centering of the Homepage and button layout 2020-11-12 11:13:53 +00:00
Michael Telatynski
bf62960e1a
Merge pull request #5413 from matrix-org/t3chguy/fix/11415 
Change how we expose Role in User Info and hide in DMs
 2020-11-11 18:15:46 +00:00
Michael Telatynski
edb5e10506 Iterate registration to simplify it based on usertesting 2020-11-11 17:04:10 +00:00
Michael Telatynski
a481f3bdf1 Iterate the filtering prompt 2020-11-11 17:04:09 +00:00
Michael Telatynski
0766519467
Merge pull request #5398 from matrix-org/t3chguy/fix/8141 
Improvements around new room empty space interactions
 2020-11-10 13:09:59 +00:00
Michael Telatynski
5fb86f74d7 Remove unused IconButton 2020-11-10 12:06:56 +00:00
Michael Telatynski
80bb091cc5 Iterate PR 2020-11-10 10:00:55 +00:00
David Baker
50bce642d5
Merge pull request #5366 from matrix-org/dbkr/call_hold 
Implement call hold
 2020-11-10 08:41:34 +00:00
Aaron Raimist
eccd74cfc9
Allow SearchBox to expand to fill width 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-11-09 20:12:28 -06:00
Michael Telatynski
5dd0766d35 Add missing scss file 2020-11-09 14:36:12 +00:00
Michael Telatynski
36ef9ec341 Update styling of the Analytics toast to try and decrease number of users blindly pressing No 2020-11-09 14:21:45 +00:00
Michael Telatynski
602232a524
Update res/css/views/messages/_CreateEvent.scss 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-11-05 16:08:36 +00:00
Michael Telatynski
81f1e1d8d7 delint 2020-11-05 15:54:21 +00:00
Michael Telatynski
664079a127 Use MiniAvatarUploader for the new NewRoomIntro component 2020-11-05 15:50:42 +00:00
Michael Telatynski
6aeea3e38e Extract MiniAvatarUploader into a reusable component 2020-11-05 15:42:45 +00:00
Michael Telatynski
0a42853a25 Fix centering of bubble event tile 2020-11-05 15:39:37 +00:00
Michael Telatynski
2594ff8e80 Remove old isAlone checker 2020-11-05 15:39:22 +00:00
David Baker
d145b1081c Merge branch 'dbkr/call_hold' into dbkr/new_look_callview 2020-11-05 14:25:35 +00:00
David Baker
90bbc082dc
Copyright 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-11-05 09:25:52 +00:00
Michael Telatynski
af71b0735d Change icon for the Create Event bubble tile 2020-11-04 17:24:03 +00:00
Michael Telatynski
ff25a9b45d Consolidate all EventTile bubble stuff into its own component and use it for the room continuation plinth 2020-11-04 17:06:38 +00:00
Michael Telatynski
5a8525dd93
Merge pull request #5387 from matrix-org/t3chguy/fix/13066 
Invite / Create DM UX tweaks
 2020-11-04 14:01:21 +00:00
Michael Telatynski
3b7b66c856 Change out caption for email invite suggestions and stack vertically 2020-11-03 14:56:06 +00:00
Michael Telatynski
2064cf80f5 Use semi-bold for Modal titles 2020-11-03 13:21:33 +00:00
Michael Telatynski
a2885dcfe8 fix alignment of Modal X icon 2020-11-03 13:18:18 +00:00
Michael Telatynski
66377eb731 Invite UX tweaks: 
+ re-focus input field after all interactions
+ change textarea to text input
+ fix margins between things
+ improve keyboard usage with enter/space autofilling
 2020-11-03 13:14:35 +00:00
Michael Telatynski
4afa610ee1 Add variant of default home page for justRegistered 2020-11-02 17:24:47 +00:00
Michael Telatynski
fa9490b02b Add skeleton UI for Room List when no rooms 2020-11-02 17:22:45 +00:00
David Baker
7796621e8d Merge remote-tracking branch 'origin/develop' into dbkr/call_hold 2020-10-30 16:49:42 +00:00
David Baker
90cdc2f341 Add the new css file 2020-10-30 13:47:43 +00:00
Michael Telatynski
444425b9ab
Merge pull request #5365 from matrix-org/t3chguy/countly 
Initial Countly work
 2020-10-30 13:07:58 +00:00
Aaron Raimist
c636dc0ed3
Fix custom tag layout which regressed in #5309 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-10-29 16:54:55 -05:00
David Baker
f828c6d494 Implement call hold 
Currently just by adding /holdcall and /unholdcall slash commands

The only place the hold status of the call is currently represented
is when the call is a voice call and you're viewing a different room:
it's not wired up when you're viewing the room because that currently
uses the room status bar which it won't do with the new UI.

Also convert VideoFeed to typescript, and remove videoview because
it essentially just managed the fullscreen functionality, but we'll
want and 'on hold' representation (and probably chrome for hagnup etc)
in the fullscreen UI too, so let's just make CallView the thing that
gets fullscreened.
 2020-10-29 17:56:24 +00:00
Michael Telatynski
c3a355097d Initial Countly work 2020-10-29 15:57:16 +00:00
Michael Telatynski
0004dd4475 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 2020-10-22 21:40:05 +01:00
Michael Telatynski
4e12aeca9e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
 2020-10-21 12:48:51 +01:00
Michael Telatynski
a5468c918e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/resizer/distributors/collapse.ts
	src/resizer/distributors/fixed.ts
	src/resizer/index.ts
	src/resizer/item.ts
	src/resizer/resizer.ts
	src/resizer/sizer.ts
 2020-10-21 09:56:22 +01:00
Michael Telatynski
5a9bac68c6 iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-21 09:48:02 +01:00
Michael Telatynski
334ab12c47 Tidy up widget colouring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 16:06:35 +01:00
Michael Telatynski
24c4a3876c Increase Border Radius of Accessible Buttons to 8px 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:38 +01:00
Michael Telatynski
b6fd2a0691 Iterate the Modal Widget Dialog paddings and phishing warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-20 15:05:22 +01:00
Michael Telatynski
bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets 
 Conflicts:
	src/components/views/elements/AppTile.js
	src/utils/WidgetUtils.ts
 2020-10-19 20:50:16 +01:00
Michael Telatynski
00b1a03a3e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets 
 Conflicts:
	src/@types/global.d.ts
	src/FromWidgetPostMessageApi.js
	src/WidgetMessaging.js
	src/widgets/WidgetApi.ts
 2020-10-19 19:46:07 +01:00
Michael Telatynski
06009df05b Update Widget paddings and background colours 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 18:47:15 +01:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski
30adc98a15 Fix excessive hosting link padding 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-19 12:34:25 +01:00
Resynth
091143db52 Add border-radius for video 
Images have a rounded border, so we may as well add it to videos.
Works fine in Chrome, and in other spec-compliant browsers.

Signed-off-by: Resynth <resynth1943@tutanota.com>
 2020-10-18 22:40:19 +01:00
Michael Telatynski
84111a2eaf
Merge pull request #5326 from matrix-org/t3chguy/fix/11195 
Discard all mx_fadable legacy cruft which is totally useless
 2020-10-15 18:34:03 +01:00
Michael Telatynski
9234a58bdf
Merge pull request #5318 from matrix-org/t3chguy/fix/9232 
Fix aspect ratio of avatar before clicking Save
 2020-10-15 16:48:07 +01:00
Michael Telatynski
6b01b6ac6c Discard all mx_fadable legacy cruft which is totally useless 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 16:13:16 +01:00
Michael Telatynski
efbce309d0 improve paddings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:42:08 +01:00
Michael Telatynski
f198b95579 Iterate PR; tidy and improve widget context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 15:24:42 +01:00
Michael Telatynski
a6c81a903c Iterate with new buttons and resize locking 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-15 11:14:48 +01:00
Travis Ralston
43208c01a1 Fix variable naming 2020-10-14 16:30:38 -06:00
Arsh Sharma
a5d01f2f4d missed a replacement 2020-10-14 17:18:50 +05:30
Arsh Sharma
49d99c6dc7 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-final-10 2020-10-14 16:58:05 +05:30
Michael Telatynski
00e35dafb3 Fix aspect ratio of avatar before clicking Save 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-14 10:57:34 +01:00
Michael Telatynski
bb52bad099 Remove stale props and CSS classes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:23:49 +01:00
Michael Telatynski
447ea9eb23 Relax flexboxes in resizer on window resize 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 16:11:58 +01:00
Michael Telatynski
ba21c6ed36 Iterate on Widget icons and resizing handles 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 15:56:53 +01:00
Michael Telatynski
7be5ff0fe6 First cut of app drawer tiled resizing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:29:12 +01:00
Michael Telatynski
f72b1e0c7d Remove stale things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-13 12:27:50 +01:00
Michael Telatynski
c1fef5a941 Improve the styling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:36:09 +01:00
Michael Telatynski
7820f9c28a Switch to WidgetAvatar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-12 13:16:55 +01:00
RinkiyaKeDad
4f8b0afc41 updated TagPanel 2020-10-10 18:00:06 +05:30
Michael Telatynski
ada6d1aa46 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-09 08:42:21 +01:00
Michael Telatynski
b8080a7d2d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-08 13:04:59 +01:00
J. Ryan Stinnett
576ea6df08 Use same colour variable as text 2020-10-08 10:01:05 +01:00
J. Ryan Stinnett
73ce2fac8a Add comment on colour 2020-10-08 09:56:58 +01:00
J. Ryan Stinnett
43ea5de320 Adjust Settings styles 2020-10-07 20:23:34 +01:00
J. Ryan Stinnett
3d0db1b022 Change invite icon 2020-10-07 20:08:59 +01:00
J. Ryan Stinnett
936344b012 Make back button a circle 2020-10-07 17:53:41 +01:00
J. Ryan Stinnett
779e43b8dd
Merge pull request #5296 from matrix-org/jryans/sso-4s-integration 
Convert auth lifecycle to TS, remove dead ILAG code
 2020-10-07 15:42:42 +01:00
J. Ryan Stinnett
40292884bf Regenerate component CSS index 2020-10-07 13:09:03 +01:00
J. Ryan Stinnett
f2b72efe39 Remove various remaining bits of ILAG flows 
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
 2020-10-07 12:53:59 +01:00
Michael Telatynski
29e3881fb3 Iterate design and fix post-merge conflict 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-07 10:36:45 +01:00
Michael Telatynski
c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 
 Conflicts:
	src/components/views/right_panel/WidgetCard.tsx
	src/stores/WidgetStore.ts
 2020-10-07 10:04:45 +01:00
Michael Telatynski
ab9b5b0d7b
Merge pull request #5265 from matrix-org/t3chguy/feat/widget-max-width 
Remove width limit on widgets
 2020-10-06 10:23:19 +01:00
Michel Zimmer
80091f7db2 Fix call container avatar initial centering 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-06 08:59:03 +02:00
Michael Telatynski
fdb8cb78f9
Merge pull request #5277 from matrix-org/t3chguy/fix/9551 
Use Own Profile Store for the Profile Settings
 2020-10-05 14:46:12 +01:00
Michael Telatynski
cf37f0abf2 Fix the AvatarSetting avatar getting crushed by the flexbox 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-05 12:54:01 +01:00
Michel Zimmer
58bbbf31b9 Fix room directory clipping links in the room's topic 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-02 18:00:58 +02:00