Commit graph

9525 commits

Author SHA1 Message Date
Michael Telatynski
b386f0c73b
Merge pull request #5657 from matrix-org/t3chguy/usercontent
Remove redundant lockOrigin parameter from usercontent
2021-02-16 18:23:55 +00:00
Michael Telatynski
6cb3381df5 Remove redundant lockOrigin parameter from usercontent
now that each Element has its own, and not usercontent.riot.im
it only has to permit its own origin
2021-02-16 18:03:12 +00:00
Jaiwanth
ee54327733 Update src/components/views/rooms/RoomTile.tsx 2021-02-16 18:59:22 +05:30
Clemens Zeidler
c84ad9bedc Use key binding for cancelling a message reply 2021-02-16 19:12:18 +13:00
Clemens Zeidler
ac7963b509 Fix lint and style issues 2021-02-16 19:05:51 +13:00
Clemens Zeidler
12387b4978 Use the KeyBindingsManager in EditMessageComposer 2021-02-16 19:05:39 +13: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
Šimon Brandner
5072fb0608
Merge branch 'develop' into improve-layout-handling 2021-02-15 16:12:08 +01:00
Šimon Brandner
65ef4f2f22
Removed the commented out code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-15 16:05:14 +01:00
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
PunitLodha
0902936d39 Add phone number only if verification is complete 2021-02-14 18:21:39 +05:30
PunitLodha
74a6c1e8d8 Dont clear email if verification cancelled by user 2021-02-14 18:21:12 +05:30
Clemens Zeidler
b4c5dec4e5 Use the KeyBindingsManager for the SendMessageComposer 2021-02-14 15:56:55 +13:00
David Baker
196507a730 VoIP virtual rooms, mk II
Does a thirdparty protocol lookup to the homeserver to get the
corresponding native/virtual user for a matrix ID. Stores the
mappings in room account data. Involves some slightly nasty workarounds
for that fact that room account data has no local echo.
2021-02-12 20:55:54 +00: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
97f5b6920c
Check if the method is defined before calling it
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 16:48:46 +01:00
Šimon Brandner
2b4859a858
Merge branch 'develop' into fix-4963 2021-02-12 16:30:01 +01:00
Šimon Brandner
b269517149
Removed wrapper
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:52:42 +01:00
Šimon Brandner
ba2c68819f
Removed showSendButton setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:45:06 +01:00
Šimon Brandner
35c0cb99d0
Use isComposerEmpty for send button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:45:03 +01:00
Šimon Brandner
50b0a78132
Renamed composerEmpty to isComposerEmpty
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:44:22 +01:00
Šimon Brandner
42a48ee27d
Added composerEmpty property
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:44:22 +01:00
Šimon Brandner
98757bb6cf
Extract send button into a function
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:44:16 +01:00
Šimon Brandner
17f09d3b7a
Added onIsEmptyChanged prop
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 15:16:07 +01:00
Šimon Brandner
d8a9b84af9
Don't show tooltip if there is nothing to display
We do this because resource is undefined for @room

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 14:28:39 +01:00
Šimon Brandner
a975de22ef
Fixed buggy tooltip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 11:27:14 +01:00
Šimon Brandner
f2137fe93f
Merge branch 'develop' into show-room-name 2021-02-12 08:21:40 +01:00
Šimon Brandner
33979b3354
Added a tooltip
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-12 08:18:27 +01:00
Michael Telatynski
da6f1e559b
Merge pull request #5634 from jaiwanth-v/add-loading-TextInputDialog
Added loading and disabled the button while searching for server
2021-02-11 12:22:27 +00:00
Jaiwanth
20dc8dbb32
Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:39:12 +05:30
Jaiwanth
61c6033de7
Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:58 +05:30
Jaiwanth
6c252a87a1
Update src/components/views/dialogs/TextInputDialog.js
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-02-11 17:38:46 +05:30
Jaiwanth
3fc6d73158 Added loading and disabled the button while searching for server
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
2021-02-11 17:28:02 +05:30
J. Ryan Stinnett
fa5df314a1
Merge pull request #5450 from matrix-org/jaywink/hosting-provider-iframe
Add host signup modal with iframe
2021-02-10 13:53:15 +00:00
Šimon Brandner
6b0b46b917
Fix duplication caused by highlighting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:20:19 +01:00
Šimon Brandner
895be6e7a6
Added second comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 14:02:45 +01:00
Šimon Brandner
5cf126dea3
Added comment back
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:41:24 +01:00
Šimon Brandner
b97d8979c7
Remove nested for loop
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-10 13:18:23 +01: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
dc549a9e4b Address some more pr feedback 2021-02-09 22:41:40 +02:00
Šimon Brandner
4a7bc74e99
Fix duplication of codeblock elements
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 19:46:30 +01:00
Jason Robinson
2197c1e519 Address some of the PR feedback 2021-02-09 20:13:58 +02:00
Michael Telatynski
59069f95e9
Merge pull request #5631 from SimonBrandner/avoid-delay-on-screen-share
Avoid delayed displaying of sources in source picker
2021-02-09 12:26:29 +00:00
Šimon Brandner
27b2b5b65d
Make componentDidMount async
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:19:12 +01:00
Šimon Brandner
98e602f544
Avoid delayed displaying of sources
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-09 13:07:23 +01:00
Jason Robinson
c92a930d0a Fix positioning of minimize action and add titles 2021-02-09 12:40:12 +02:00
Jason Robinson
ad5b40b5ba Allow popups from host signup dialog 2021-02-09 12:29:23 +02:00
Jason Robinson
e31b89b952 Restructure host signup terms dialog documents config and dialog 2021-02-09 12:23:27 +02:00
Jason Robinson
2aa4fce1c5 Remove unused types 2021-02-09 11:42:58 +02:00
Jason Robinson
5fe3c83f27 Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-09 11:18:51 +02:00
PunitLodha
392b47e200 Add email only if the verification is complete 2021-02-09 11:39:36 +05:30
William Kray
99be8ccd88 move close-preview button to top 2021-02-08 09:26:10 -08:00
William Kray
b459395d6d increase size of url preview thumbnail 2021-02-08 09:26:10 -08:00
William Kray
cd1a99186b change image rendering size max height 2021-02-08 09:26:10 -08:00
Marco Zehe
890bb5b9eb Give breadcrumbs toolbar an accessibility label.
Fixes vector-im/element-web#16406.

Signed-off-by: Marco Zehe <marco@marcozehe.de>
2021-02-08 16:58:18 +01:00
Šimon Brandner
84eba59afa
Merge branch 'develop' into improve-codeblock 2021-02-08 15:26:50 +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
Šimon Brandner
ffc0230ab4
Use resource as a fallback
This is useful mainly for the tests they would otherwise fail as there is no room name to display while the tests are run.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-06 19:09:34 +01:00
Šimon Brandner
58ab5c36bb
Merge branch 'develop' into show-room-name 2021-02-06 15:27:04 +01:00
Š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
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
Š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
Šimon Brandner
ec73f2ec49
Change comment styling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:30:54 +01:00
Šimon Brandner
77248725ed
Added onHeightChanged call
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:29:24 +01:00
Šimon Brandner
ad5c8fe7e4
Revert "Rerender MessagePanel"
This reverts commit c7e61ac71d.
2021-02-05 08:27:07 +01:00
Šimon Brandner
9bd8fef6b3
Change comment styling
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-05 08:22:02 +01:00
Šimon Brandner
f2d236d429
Use LayoutPropType
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-02-05 08:17:30 +01:00
Jason Robinson
f5f8050172 Add minimize button to HostSignupDialog.tsx 2021-02-04 23:09:58 +02:00
Jason Robinson
fd55b99a26 Remove a comment that is not true anymore 2021-02-04 23:05:24 +02: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
Šimon Brandner
9db86a38f6
Update src/components/views/messages/TextualBody.js
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-02-04 17:58:21 +01: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
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
Jason Robinson
987ee702d3 Ensure iframe gets maximize/minimize events 2021-02-04 18:30:12 +02:00
Travis Ralston
97584af947 Fix z-index of stickerpicker 2021-02-04 02:50:54 -07:00
Jason Robinson
6ccce7142c Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip 2021-02-03 22:35:22 +02: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
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
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
a32495ba9e
Merge pull request #5587 from dangwynne/develop
Fix new rooms being titled 'Empty Room'
2021-02-01 13:01:38 +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
Š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
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
Jason Robinson
4ee6016084 Some cleanup 2021-01-29 15:55:14 +02: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
0eb0d242d5
Apply suggestions from code review
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-01-29 13:05:09 +00:00
Michael Telatynski
0167c3cefb Iterate SSO auth ux styling 2021-01-29 13:04:05 +00:00
Michael Telatynski
1eb88c988c Add tooltips to mini sso buttons 2021-01-29 12:05:15 +00:00
dangwynne
dc81496c3b add optional chaining operator 2021-01-29 11:31:21 +00:00
J. Ryan Stinnett
c9a6214256 Tweak a few room ID checks 2021-01-29 11:15:30 +00:00
Šimon Brandner
4f065ad822
Fix escape for cancelling replies
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-29 10:31:59 +01:00
dangwynne
992247201e Fix issue #16270 new rooms are titled 'Empty Room'. Signed-off-by: Dan Gwynne dangwynne1@gmail.com 2021-01-28 20:36:33 +00:00
Travis Ralston
310a2e9b2a
Merge pull request #5580 from matrix-org/travis/widgets/oidc-verif-diag
Run a UI refresh over the OIDC Exchange confirmation dialog
2021-01-28 07:47:11 -07:00
J. Ryan Stinnett
4920614ca5
Merge pull request #5529 from SimonBrandner/hide-local-feed
Hide local video if it is muted
2021-01-28 12:49:52 +00:00
J. Ryan Stinnett
5431dc7331
Merge pull request #5548 from SimonBrandner/add-search-shortcut
Add optional search shortcut
2021-01-28 12:33:32 +00:00
J. Ryan Stinnett
08d495eee8
Merge pull request #5584 from 2580ayush2580/ayush25805
Fix Sudden 'find a room' UI shows up when the only room moves to favourites
2021-01-28 12:25:47 +00:00
Michael Telatynski
1761a4ec80 Improve SSO UIA
Fixes Fallback UIA postmessage interface
Auto-closes SSO UIA tab when the user has completed the flow within it
Error for when auth stage is restarted because it failed
2021-01-28 10:45:29 +00:00
Travis Ralston
41068c7849
Merge pull request #5568 from SimonBrandner/fix-15221
Increase PersistedElement's z-index
2021-01-27 20:37:11 -07:00
Travis Ralston
41682fa8d2
Update src/components/views/elements/PersistedElement.js 2021-01-27 20:37:04 -07:00
Travis Ralston
c1b33d3e2c Fix Jitsi widgets causing localized tile crashes
Seems to be that as part of the layout work the timing sequence for when `.getRoom().widgets` will work changed. We can get around this with `initIfNeeded` which will no-op in the worst case.

This also includes a copy change to make ended conferences stop lying about where to find the widget. This is work towards https://github.com/vector-im/element-web/issues/15739
2021-01-27 14:40:04 -07:00
Ayush Kumar
2c11f0bb7c Added condition to hide the 'find a room' UI unless the user is explicitly filtering the list 2021-01-28 03:09:52 +05:30
Travis Ralston
db346d129b Run a UI refresh over the OIDC Exchange confirmation dialog 2021-01-27 13:13:44 -07: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
Michael Telatynski
e6673bca1b Improve SSO auth flow
Use replaceState instead of a redirect to strip the loginToken
Put user into the same post-auth flows of E2ESetup
Skip UIA prompt in this post-auth flow, happy path is a server grace period
2021-01-27 12:50:12 +00:00
J. Ryan Stinnett
d78bc98521 Resolve linting errors after upgrades 2021-01-27 12:42:39 +00:00
J. Ryan Stinnett
84b1f2e6c6 Resolve typing errors after TypeScript upgrade 2021-01-27 12:42:37 +00:00
J. Ryan Stinnett
fa3ace8473 Rework message pilling to ignore event permalinks
This removes pills from event permalinks since they hide the text associated
with the link, which can cause nonsensical messages since words have been
removed. In addition, this moves away from fragile regexs to more
straightforward code to parse links and adds a test for this case.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/5188
Fixes https://github.com/vector-im/element-web/issues/15159
2021-01-27 11:46:20 +00:00
J. Ryan Stinnett
71921ad705 Remove unused isPillUrl 2021-01-26 14:11:09 +00:00
J. Ryan Stinnett
501c73ae4b Remove outdated comment 2021-01-26 14:08:39 +00:00
Šimon Brandner
02b552f958
Fixed 15221
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-24 12:56:44 +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
Ayush Kumar
593171bb79 Continuing without email' dialog bug fixes 2021-01-23 15:31:59 +05:30
Šimon Brandner
972c947049
More generic layout setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-23 10:35:35 +01:00
David Baker
f703383ab6
Merge pull request #5560 from matrix-org/dbkr/voip_user_mapper
Add VoIP user mapper
2021-01-22 14:12:08 +00: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
Šimon Brandner
0c09158f2a
Comment out unused code
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-22 08:41:39 +01:00
Dan
591b50b1fb fix issue 16226 to allow switching back to default HS. Signed-off-by: Dan Gwynne dangwynne1@gmail.com 2021-01-21 21:51:22 +00:00
Travis Ralston
a779951512
Merge pull request #5553 from matrix-org/travis/widget-layout
Support room-defined widget layouts
2021-01-21 13:22:52 -07:00
David Baker
0a90c982c7 Add VoIP user mapper
The accompanying element-web PR with the config documentation should
explain what this is & why. Internally, this breaks the assumption
that call.roomId is the room that the call appears in for the user.
call.roomId may now be a 'virtual' room while the react SDK actually
displays it in a different room. React SDK always stores the calls
under the user-facing rooms, and provides a function to get the
user-facing room for a given call.
2021-01-21 19:20:35 +00:00
J. Ryan Stinnett
e49a931588
Merge pull request #5533 from aaronraimist/security-key
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
2021-01-21 17:46:02 +00:00
Šimon Brandner
f1a3240ec3
Merge branch 'develop' into improve-codeblock 2021-01-21 17:36:22 +01:00
Šimon Brandner
c7e61ac71d
Rerender MessagePanel
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 17:32:57 +01:00
Michael Telatynski
928ddeb718 Improve styling of SSO Buttons for multiple IdPs 2021-01-21 13:33:25 +00:00
Šimon Brandner
97c5058f00
Removed log
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:10:21 +01:00
Šimon Brandner
da09362f99
Added option to hide line numbers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:08:55 +01:00
Šimon Brandner
c737543114
Remove commented lines
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-21 13:04:51 +01: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
f8179f0c7a
Fix inverted icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 14:08:57 +01:00
Šimon Brandner
25f30ca79f
Fix indent
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:05:23 +01:00
Šimon Brandner
072cbe98b5
Simplifie
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 13:03:05 +01:00
Šimon Brandner
8535a11dd2
Rename some variable and cleanup a bit
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-20 08:44:32 +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
95939f3d6c
Added _wrapInDiv() method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-19 18:21:59 +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
Travis Ralston
6227d3c183 Appease the linters 2021-01-18 20:53:15 -07:00
Travis Ralston
04d1f5dd28 Implement a "Copy my layout to the room" button 2021-01-18 20:42:21 -07:00
Travis Ralston
1768d6ea5f Move all widget pinning logic to the WidgetLayoutStore 2021-01-18 20:26:47 -07:00
Travis Ralston
5b5c338200 Render layout changes in the timeline 2021-01-18 19:31:11 -07:00
Travis Ralston
0d29d15a46 Support room-defined height as well
Much like widget widths, it is acceptable for us to forget what everyone's height was previously at.
2021-01-18 19:27:11 -07:00
Travis Ralston
cfb583d193 Calculate widget widths in the WidgetLayoutStore
Note that this ditches all previously set width values, however this is probably acceptable for now. Trying to remain backwards compatible gets tricky on top of already tricky code, and the impact of Element forgetting widths is not as severe as forgetting which widgets were/are pinned.
2021-01-18 18:50:36 -07:00
Travis Ralston
2548a438ae Render ordering changes in the AppsDrawer 2021-01-18 17:43:29 -07:00
Šimon Brandner
45d0270bca
Merge branch 'develop' into expand-codeblock 2021-01-18 19:08:24 +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
Šimon Brandner
7f727be4f6
Added expand code block option
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-18 17:44:32 +01:00
Ayush Kumar
530a242aae Fixed continue button while selecting home server 2021-01-18 21:41:10 +05:30
Will Hunt
d71b2cf04f Merge remote-tracking branch 'origin/develop' into hs/bridge-info-v2 2021-01-18 11:36:46 +00:00
J. Ryan Stinnett
1c5a234b93
Merge pull request #5547 from matrix-org/jryans/listener-overload
Use room-specific listeners for message preview and community prototype
2021-01-18 10:57:56 +00:00
Šimon Brandner
e7384f829a
Made search shortcut optional
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-17 16:44:29 +01:00
Šimon Brandner
c9f5c90047
Rename method
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-16 16:43:47 +01:00
Šimon Brandner
c61e41ba77
Rename setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-16 16:37:50 +01:00
Šimon Brandner
9f1113b3bd
Watch setting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-16 16:35:50 +01:00
Jason Robinson
39984c9a34 WIP 2021-01-15 17:14:55 +02:00
Jason Robinson
3901cd9c72 WIP 2021-01-15 17:02:28 +02:00
J. Ryan Stinnett
462e0889f0 Fix lint 2021-01-15 14:46:38 +00:00
J. Ryan Stinnett
8a341446aa Use room-specific listeners for community prototype
Similar to message previews, this changes another area to use room-specific
listeners for better performance and avoiding warnings.
2021-01-15 14:34:56 +00:00
J. Ryan Stinnett
729356394e Use room-specific listeners for message previews
This should be a bit faster (since we now only notify one tile instead of all
for each update). It also resolves the max listener warning.

Fixes https://github.com/vector-im/element-web/issues/15121
2021-01-15 14:21:21 +00: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
J. Ryan Stinnett
e90009772d Fix React warnings about missing key for edited messages
This uses a fragment instead of an array to avoid the need for key attributes.
2021-01-15 13:20:49 +00:00
J. Ryan Stinnett
6d932e1352 Fix lint errors 2021-01-14 17:38:06 +00:00
J. Ryan Stinnett
658a8dfa99 Use device storage for allowed widgets if account data not supported
With guest accounts, account data is not available, so we use device storage to
hold allowed widgets as a good enough place.

Fixes https://github.com/vector-im/element-web/issues/16145
2021-01-14 17:30:25 +00:00
Šimon Brandner
eca8ef3b35
Update thumbnails
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-14 12:44:48 +01:00
Jason Robinson
d6af5b3bbd WIP minimize 2021-01-14 12:20:42 +02:00
Jason Robinson
d4a58bdb2a WIP minimize 2021-01-14 11:53:20 +02:00
Šimon Brandner
8f91b04eb3
Use contextBridge
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-14 08:35:04 +01:00
Šimon Brandner
b2850e11db
Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing 2021-01-13 19:47:07 +01: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
Travis Ralston
a8d878dc48
Merge pull request #5528 from matrix-org/travis/widget-devtools
Add a basic widget explorer to devtools (per-room)
2021-01-11 11:00:08 -07:00
J. Ryan Stinnett
77f79e599f
Merge pull request #5534 from SimonBrandner/fix-16071
Add <input type="password"> to security key field
2021-01-11 17:13:35 +00: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
c64b2a585f
Added option to disable send button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-09 09:17:40 +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
448a5ea42d Remove replaceableComponentTs from BridgeTile 2021-01-08 18:07:48 +00: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
20b1720258
Added a line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 21:08:25 +01: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
99dc829369
Fixed translation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 20:27:11 +01:00
Šimon Brandner
d497594a6f
Remove unnecessary line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:55:08 +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
Šimon Brandner
efd889c09a
Remove commented line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-01-05 19:32:59 +01:00
David Baker
2d37151750
Merge pull request #5523 from matrix-org/dbkr/dial_pad
Add a dialpad UI for PSTN lookup
2021-01-05 17:23:34 +00:00
David Baker
470756546c
Merge pull request #5494 from matrix-org/dbkr/call_transfer
Basic call transfer initiation support
2021-01-05 17:22:22 +00:00
Jason Robinson
325447d9fa Remove the dedicated host signup dialogs, use QuestionDialog 2021-01-05 14:47:39 +02:00
Jason Robinson
5f84371038 Update some copyrights 2021-01-05 14:29:48 +02:00
SimonBrandner
247bd09312
Fixed 16071
Signed-off-by: SimonBrandner <simon.bra.ag@gmail.com>
2021-01-05 13:20:59 +01:00
Aaron Raimist
4f96d5dee5
Change a bunch of strings from Recovery Key/Phrase to Security Key/Phrase
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-04 19:17:17 -06: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
David Baker
a258a3874b Use objectShallowClone 2021-01-04 11:51:27 +00:00
Aaron Raimist
b8334bfd4a
Add option to hide the stickers button in the composer
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2021-01-02 15:31:54 -06:00
Šimon Brandner
86cb7f99ce
Hide localVideoFeed if video is muted
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-30 08:46:54 +01:00
Travis Ralston
5773d78464 Maybe this will appease the linter. 2020-12-29 15:40:44 -07:00
Travis Ralston
64b056d689 Appease the linter 2020-12-29 15:34:40 -07:00
Travis Ralston
254e0b9a94 Add a basic widget explorer to devtools (per-room) 2020-12-29 15:30:22 -07:00
Šimon Brandner
4185d53468
Disable add button if the field is empty
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-29 16:30:20 +01:00
Šimon Brandner
0083cf56bf
Hide buttons only if perrmissions are missing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-29 16:20:43 +01:00
Šimon Brandner
7912091bc5
Revert "Hide add button when new item field is empty"
This reverts commit fa99c2e8c5.

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-29 16:08:54 +01: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
14a3b88497
Consistent formatting
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-28 08:15:54 +01:00
Michael Telatynski
7af1471052 delint2 2020-12-27 21:46:56 +00:00
Michael Telatynski
ce5b244a24 delint 2020-12-27 21:25:48 +00:00
Michael Telatynski
8ee65258be Unfloat the MiniAvatarUploader "tooltip" 2020-12-27 21:13:01 +00:00
Michael Telatynski
f4190ccae2 Fix mini avatar uploader "working" even without permissions 2020-12-27 21:01:51 +00:00
Šimon Brandner
5779a543c9
Type cleanup
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 18:10:50 +01:00
Šimon Brandner
322afe6450
Remove log
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-26 18:00:08 +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
a7ca1d0856 Remove unnecessary line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 13:26:53 +01:00
Šimon Brandner
fa99c2e8c5 Hide add button when new item field is empty
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 13:14:55 +01: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
48cfd3f9da Fixed some avatar stuff
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 09:29:35 +01:00
Šimon Brandner
15d10042ee Fixed 16014
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2020-12-22 08:52:21 +01:00
Jason Robinson
129795c2ec Add allow-same-origin to Element Pro dialog
Seems to be required after all.
2020-12-21 17:20:51 +02:00
David Baker
aee861956c Remove secondary call avatar
and change 'paused' to 'on hold'
2020-12-18 19:40:57 +00:00
David Baker
eab764a3c8 Vary resume link text
Use 'Switch' if unholding that call would hold another
2020-12-18 19:35:41 +00:00
Jason Robinson
1b6e90dcb8 More sandboxing 2020-12-18 16:09:11 +02:00
Jason Robinson
0ae28d584b Typing and other PR feedback fixes 2020-12-18 16:05:57 +02:00
J. Ryan Stinnett
8350b4152b Import from src in IncomingCallBox.tsx 2020-12-17 17:16:00 +00:00
Michael Telatynski
2567fcd045 add brackets for operator precedence 2020-12-17 12:02:16 +00:00
Michael Telatynski
1b2cfa5f05 Social Login support both https and mxc icons 2020-12-17 10:34:49 +00:00
Jason Robinson
f0e93c6929 Mark remaining strings to be translated 2020-12-17 12:06:42 +02:00
Jason Robinson
5aa24b97cd Merge remote-tracking branch 'origin/develop' into jaywink/elementPro 2020-12-16 14:45:16 +02:00
Michael Telatynski
940fdb8e2f Better adhere to MSC process 2020-12-16 10:07:07 +00:00
David Baker
a33be00c08 Basic call transfer initiation support
Adapt the InviteDialog to select a transfer target

Doesn't support supplying a roo mID fr the transfer: just leaves
the transferee to work out how to contact the target themselves.

MSC2747 (matrix-org/matrix-doc#2747)
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1558
2020-12-15 14:59:06 +00: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
David Baker
2d36910577
Add comment
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-14 22:52:30 +00:00
David Baker
df825792bc These can just all be Members 2020-12-14 22:51:40 +00:00
David Baker
32f693e3b0 Convert InviteDialog to TypeScript
Before I start using it to select VoIP transfer targets
2020-12-14 22:28:21 +00:00
J. Ryan Stinnett
70f24baaf1
Merge pull request #5425 from macekj/emoji_quick_shortcut
Add keyboard shortcut for emoji reactions
2020-12-14 13:12:49 +00:00
Will Hunt
c5e578a502 linting 2020-12-14 12:59:59 +00:00
Will Hunt
da86bc0b0a Allow sender for backwards compat 2020-12-14 12:59:59 +00:00
Will Hunt
48018615f8 Add support for linking to the remote network page 2020-12-14 12:59:59 +00:00
Will Hunt
d6312606e6 Use correct key for avatar 2020-12-14 12:59:59 +00:00
Will Hunt
e448da0bcd Add interface for event content, and validate 2020-12-14 12:59:59 +00:00
Will Hunt
8d203043d4 Remove hide/show behaviour 2020-12-14 12:59:59 +00:00
Will Hunt
8e6061b37a Ts tweaks 2020-12-14 12:59:59 +00:00
Will Hunt
86200e5519 Convert BridgeTile to Typescript 2020-12-14 12:59:59 +00:00
Jason Robinson
04bd5f648f Add confirmation dialog before transferring account data 2020-12-11 16:25:22 +02:00
Jason Robinson
518c4c5dc9 HostingSignupDialog now returns requested data in one message 2020-12-11 16:03:18 +02:00
David Baker
07fa535513 Merge remote-tracking branch 'origin/develop' into dbkr/line_1_2 2020-12-10 16:11:29 +00:00
Travis Ralston
18a60ae2ea
Merge pull request #5484 from matrix-org/travis/remove-dead-feature
Remove impossible labs feature: sending hidden read receipts
2020-12-10 08:24:05 -07:00
David Baker
80be46bc32 Fix vertical scrolling in videoview
Fixes https://github.com/vector-im/element-web/issues/15886
2020-12-10 15:18:22 +00:00
David Baker
026b4422a8 Merge remote-tracking branch 'origin/develop' into dbkr/call_ui_height 2020-12-10 12:36:51 +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
Travis Ralston
27df6ae6e1 Remove impossible labs feature: sending hidden read receipts
This claims it requires a compatible homeserver, but that does not exist and hasn't for years. Let's just remove the option to stop giving people false hope.

Once notifications are decoupled from read receipts, this sort of thing should be more possible.
2020-12-09 18:36:48 -07:00
Travis Ralston
af69ba9c79
Merge pull request #5451 from iokiwi/new/room-alias-in-permalink
Use room alias in generated permalink for rooms
2020-12-09 12:07:44 -07:00
Michael Telatynski
d05ad1e36c
Merge pull request #5481 from matrix-org/t3chguy/fix/15905
Throttle RoomState.members handler to improve performance
2020-12-09 12:53:34 +00:00
Michael Telatynski
91ae8df423
Merge pull request #5477 from matrix-org/t3chguy/fix/15913
Handle manual hs urls better for the server picker
2020-12-09 11:32:33 +00:00
Michael Telatynski
5be65a525d Improve identifiers and code readability 2020-12-09 11:14:06 +00:00
Michael Telatynski
ecb0b0113f Also use getJoinedMemberCount as its capable of using the room summary member count instead
Leave the useRoomMembers hook for future use as it is very useful.
2020-12-09 11:07:40 +00:00
Michael Telatynski
184c73cca4 Throttle RoomState.members handler to improve performance
Lazy Loading emits a RoomState.members for each member which in the case of a room like
Matrix HQ means it happens over 8000 times in a very short span of time causing the UI
to lock up.
2020-12-09 11:02:30 +00:00
David Baker
4a009d480d Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-08 11:48:14 +00:00
Michael Telatynski
e896b009f1 Handle manual hs urls better 2020-12-08 10:58:16 +00:00
Michael Telatynski
9f9699bf75 Hide Invite to this room CTA if no permission 2020-12-08 10:31:40 +00:00
Travis Ralston
603a1c8ffb Fix linter 2020-12-07 15:37:26 -07:00
Travis Ralston
550a5220d9 Undocumented linter cleanup 2020-12-07 15:12:26 -07:00
Travis Ralston
2c992c456e Merge remote-tracking branch 'origin/develop' into feature_confetti#14676 2020-12-07 14:58:56 -07: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
Michael Telatynski
499f7e8af7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 2020-12-07 16:08:11 +00:00
Michael Telatynski
d06a00bcce Improve usability of the Server Picker Dialog 2020-12-07 16:05:41 +00:00
David Baker
3b25a3be98 Smaller avatar, more padding on text 2020-12-07 15:42:35 +00:00
Simon Merrick
b365d3b27e Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into new/room-alias-in-permalink 2020-12-07 10:30:50 +13:00
Simon Merrick
5544ee6408 extract alias handling to separate function 2020-12-06 23:29:11 +13:00
Lukas
a856484139 Fix typos in some strings
This commit fixes some typos that I've stumbled upon.
2020-12-06 10:32:52 +01:00
David Baker
ab71547c4c Don't let call room names push out their containers 2020-12-04 20:36:08 +00:00
David Baker
faf2922b1b Update video element when the call changes in a videoview
Because that can happen now
2020-12-04 19:41:48 +00:00
macekj
0c85cb587d Merge branch 'develop' into emoji_quick_shortcut 2020-12-04 11:05:50 -05:00
J. Ryan Stinnett
c13891c670
Merge pull request #5260 from orangecms/redact-with-reason
add support for giving reason when redacting
2020-12-04 15:13:40 +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
Michael Telatynski
b200211660
Merge pull request #5465 from matrix-org/t3chguy/socials
Fix React complaining about unknown DOM props
2020-12-03 15:20:16 +00:00
Michael Telatynski
1afece9a14 Fix React complaining about unknown DOM props 2020-12-03 12:20:48 +00:00
Michael Telatynski
e4b929c6f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882 2020-12-03 11:42:47 +00:00
Michael Telatynski
3223b00028 Jump to home page when leaving a room
so that you don't get thrown into a room you may be ignoring on purpose
2020-12-03 11:15:55 +00:00
Michael Telatynski
0fd9b55b95 Fix SSO buttons for Social Logins 2020-12-03 11:08:16 +00:00
Šimon Brandner
19d9ea3477 Merge branch 'develop' into feature-multi-language-spell-check 2020-12-03 12:06:43 +01:00
Šimon Brandner
fa19adcfe0 Simplifie 2020-12-03 11:50:08 +01:00
macekj
27a853c586 use textSerialize function to get model text 2020-12-02 15:01:44 -05:00
Šimon Brandner
bab541a652 Hide spell-check settings if not using Electron 2020-12-02 20:14:58 +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
Jason Robinson
31c7c05f2e Convert ConfirmCloseHostingSignupDialog to typescript 2020-12-02 11:12:45 +02:00
Travis Ralston
bd1de8d45b Require a room ID for WidgetStore's pinned widget contracts
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.

Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
2020-12-01 13:05:48 -07:00
Šimon Brandner
db5bc0cb7a Fix formatting 2020-12-01 20:36:25 +01:00
Šimon Brandner
3c2bb6e4f6 Cleanup 2020-12-01 20:17:24 +01:00
nurjinn jafar
111515e794 fixed linter problem 2020-12-01 17:37:28 +01: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
Šimon Brandner
e9203d7571 Removed unnecessary imports 2020-12-01 17:21:23 +01:00
nurjinn jafar
1bf7ff8994 null check added
path to confetti fixed after refactoring
2020-12-01 17:15:02 +01:00
Šimon Brandner
cf61d50df4 Added SpellCheckLanguagesDropdown 2020-12-01 16:59:21 +01:00
Šimon Brandner
b207a877eb Change label 2020-12-01 16:59:02 +01:00
David Baker
31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
Jason Robinson
c03a50e34b
Semiclon
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:51:46 +02:00
Jason Robinson
8f7b012ec1
Interface syntax
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:50:58 +02:00
Jason Robinson
85ce95e066
Interface syntax
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:50:42 +02:00
Jason Robinson
f112f4fcef
Method scoping
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-12-01 13:49:47 +02:00
anonym
b1b0e93d5e
Update i18n for Appearance User Settings
The variable has to be added to the i18n files as well (I don't know how to do that)
2020-11-30 21:33:52 +01:00
David Baker
cb6c080828 Fix remote video being too tall and causing aux panel to scroll 2020-11-30 16:44:31 +00:00
Michael Telatynski
d4ed4a135c
Merge pull request #5442 from RinkiyaKeDad/avatar-fix
Fixed Avatar for 3PID invites
2020-11-30 09:49:05 +00:00
Šimon Brandner
5d9f5ba979 Fix indentation 2020-11-30 08:35:51 +01:00
Šimon Brandner
ead00dcded Set spell-check languages without reloading 2020-11-29 14:46:09 +01:00
Šimon Brandner
8f40cd39fd Added styling 2020-11-29 12:29:05 +01:00
Šimon Brandner
f0bbed0c44 Allow default value 2020-11-29 12:17:07 +01:00
Šimon Brandner
5e4f9907cf Added persistance 2020-11-28 19:39:09 +01:00
Šimon Brandner
aba5ef100f Merge branch 'develop' into feature-multi-language-spell-check 2020-11-28 19:18:17 +01:00
macekj
200c061968 remove unnecessary plus checks in emoji regexes
Signed-off-by: macekj <macekj@umich.edu>
2020-11-27 19:41:45 -05:00
nurjinn jafar
82023dcf42 Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +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
cdf8aa13cc Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-11-27 16:01:29 +02:00
Šimon Brandner
eb64e5b2af Merge branch 'develop' into feature-change-password-validation 2020-11-27 14:46:08 +01:00
Jason Robinson
835e417333 Translate all the strings 2020-11-27 15:10:35 +02: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
Jason Robinson
2aa36acae0 Change some messageHandler actions
setup_complete does not close the dialog but
just allows marking the setup as completed.

close_dialog closes the dialog immediately.
2020-11-27 15:10:35 +02:00
Jason Robinson
d089eb720f Remove the signup iframe link text from the ProfileSettings.js 2020-11-27 15:10:35 +02:00
Jason Robinson
d607999cff Send also domain and user localpart to HostingSignupDialog iframe 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
1e699b7ef3 Enable token request for HostingSignupDialog
Needed for the last part of setup which is triggering
a migration process to the new host.
2020-11-27 15:10:35 +02:00
Jason Robinson
a37e0db3e1 Move HostingSignupDialog to the dialogs folder 2020-11-27 15:10:35 +02:00
Jason Robinson
e6582c140f Dont' allow HostingSignupDialog to close
Except via confirmed cancel action or host setup success postmessage.
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
Arsh Sharma
cb3b8b6c77 fix(EventTile): updated comment 2020-11-27 14:13:42 +05:30
Travis Ralston
80f1df6d95 Don't needlessly persist user widgets
Fixes https://github.com/vector-im/element-web/issues/15842

We don't have a concept of a stickerpicker staying on screen, so don't make it a thing yet.
2020-11-26 15:09:08 -07:00
Steffen Kolmer
27312c3553
Merge branch 'develop' into feature_confetti#14676 2020-11-26 18:21:28 +01:00