Commit graph

11648 commits

Author SHA1 Message Date
James Salter
6c2e98812b Remove test code; good job we have tests 2021-08-16 13:26:58 +01:00
James Salter
16d02f24bd lint 2021-08-16 13:06:19 +01:00
David Baker
be18178015
Merge pull request #6614 from SimonBrandner/fix/glare/18538
Fix glare related regressions
2021-08-16 12:28:10 +01:00
Dariusz Niemczyk
8bd5441fae
Merge branch 'develop' into gsouquet/fix-backdrop-filter
* develop: (22 commits)
  Fix long display names in call toasts
  Fix import
  Add MatrixEvent type
  Convert CrossSigningPanel to TS
  Fix PiP of held calls
  Use new call state icons
  Add declined call buttons
  Add "No answer" state
  Left align call tiles
  Fix tab trapping behaviour
  add comment
  Iterate PR based on feedback
  Iterate PR, merge types with @types/PushRules
  Remove misplaced bracket in a translation string
  delint and improve ts
  Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to Typescript
  remove dead code and fix some types
  delint
  post-merge fixes, the new keybindings stuff made it messy
  Improve VoiceOver & WebKit accessibility support
  ...
2021-08-16 13:16:28 +02:00
Šimon Brandner
c375b6058f
Fix call tile spacing issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 11:04:41 +02:00
Germain Souquet
02ece40103 Fix import path on ChangeAvatar 2021-08-16 09:19:58 +01:00
Germain Souquet
800b3f1424 Fix linter 2021-08-16 09:16:02 +01:00
Šimon Brandner
bd2ae762d6
Adjust max-non-narrow-width
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-16 10:08:30 +02:00
Šimon Brandner
64aa53ab24
Correctly handle media errors
The methods need to be async since play() is async, otherwise there is no point in having the try catch blocks

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-15 13:33:49 +02:00
Šimon Brandner
a6cde3256e
Properly handle call change
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-15 12:56:29 +02:00
Dariusz Niemczyk
7b72931c42
Merge pull request #6422 from libexus/i18n-bracket-fix
Remove misplaced bracket in a translation string
2021-08-15 09:20:00 +02:00
Germain Souquet
2e1d5aa67b Migrate ProfileSettings to TypeScript 2021-08-14 11:36:12 +02:00
Germain Souquet
447beb8294 Migrate IntegrationManager to TypeScript 2021-08-14 11:27:17 +02:00
Germain Souquet
dfd986751f Migrate DevicesPanelEntry to TypeScript 2021-08-14 11:22:18 +02:00
Germain Souquet
fb6a6370e7 Migrate DevicesPanel to TypeScript 2021-08-14 11:17:19 +02:00
Germain Souquet
1e431057ff Migrate ChangeDisplayName to TypeScript 2021-08-14 11:06:34 +02:00
Germain Souquet
bedfbedff0 Migrate ChangeAvatar to TypeScript 2021-08-14 11:04:36 +02:00
Germain Souquet
1f55158727 Migrate AvatarSetting to TypeScript 2021-08-14 10:53:53 +02:00
Germain Souquet
c56d267316 Migrate TopUnreadMessagesBar to TypeScript 2021-08-14 10:51:08 +02:00
Germain Souquet
eb120901ae Migrate SimpleRoomHeader to TypeScript 2021-08-14 10:48:30 +02:00
Germain Souquet
7e4c88f6ba Migrate RoomUpgradeWarningBar to TypeScript 2021-08-14 10:46:38 +02:00
Germain Souquet
7290a65924 Migrate RoomDetailList to TypeScript 2021-08-14 10:36:04 +02:00
Germain Souquet
e9e6269da7 Migrat ReadReceiptMarker to TypeScript 2021-08-14 10:31:18 +02:00
Germain Souquet
2e9cacdeb1 Migrate JumpToBottomButton to TypeScript 2021-08-14 10:22:43 +02:00
David Baker
c28d449f3f Fix import
thanks vscode
2021-08-13 18:21:59 +01:00
David Baker
7c8637f5db Add MatrixEvent type 2021-08-13 18:18:48 +01:00
David Baker
c79b6a412d Merge remote-tracking branch 'origin/develop' into dbkr/crosssigningpanel_ts 2021-08-13 18:11:54 +01:00
David Baker
e78640572d Convert CrossSigningPanel to TS
Type: task
2021-08-13 18:07:58 +01:00
Dariusz Niemczyk
7f58a21aac
Improve BackdropPanel performance by ignoring React 2021-08-13 18:12:02 +02:00
Travis Ralston
da944b2c6b
Merge pull request #6323 from matrix-org/t3chguy/ts/12
Convert SearchResult, InteractiveAuth, PushProcessor and Scheduler to TS
2021-08-13 10:08:58 -06:00
Michael Telatynski
df282807b1
Merge pull request #5659 from matrix-org/t3chguy/a11y/composer-list-autocomplete 2021-08-13 16:55:46 +01:00
Dariusz Niemczyk
5f9b55eaa9
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter
* origin/develop: (1278 commits)
  Add a little padding
  Keep number field in focus when pressing dialpad buttons (#6520)
  Remove old version
  Fix video call persisting when widget removed
  Update link to matrix-js-sdk CONTRIBUTING file (#6557)
  $toast-bg-color -> $system
  $system-... -> $system
  Iterate PR based on feedback
  Remove unnecessary code
  Use AccessibleTooltipButton
  Just upload the PR object itself
  Edit PR Description instead of commenting
  publish the right directory
  Fix Netflify builds from fork PRs
  This doesn't need to be here as it was moved into CallViewButtons
  Make scrollbar dot transparent
  Iterate PR based on feedback
  Don't set hidden RRs labs setting at account level
  Add a comment for weirdly placed div
  Add full class names to animations.scss
  ...
2021-08-13 15:12:07 +02:00
Šimon Brandner
cda91e44e0
Use new call state icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:37:17 +02:00
Šimon Brandner
032d2866a3
Add "No answer" state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 11:19:14 +02:00
Šimon Brandner
c79852a9f0
Left align call tiles
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-13 10:59:59 +02:00
Šimon Brandner
39bb253d1f
Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398 2021-08-13 10:30:21 +02:00
Andrew Morgan
1ad35b1564
Keep number field in focus when pressing dialpad buttons (#6520) 2021-08-12 18:58:06 +01:00
Travis Ralston
772b8fb3fa
Merge pull request #6593 from SimonBrandner/fix/correct-button
Use the correct button component for the Call View sidebar button
2021-08-12 08:54:53 -06:00
Michael Telatynski
4f0ae0a849 Only show spaces blue flashy dot if user is in 0 spaces 2021-08-12 15:54:41 +01:00
Michael Telatynski
57bf64bd28 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/views/spaces/SpacePanel.tsx
2021-08-12 12:05:55 +01:00
Dariusz Niemczyk
fbc5729daf
Merge pull request #6590 from matrix-org/palid/fix/images-loading-ux
Make loading encrypted images look snappier
2021-08-12 12:55:52 +02:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski
f53eb4eeed Fix tab trapping behaviour 2021-08-12 11:27:34 +01:00
Michael Telatynski
f9527c9d6b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete
 Conflicts:
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
2021-08-12 11:21:20 +01:00
Michael Telatynski
9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Šimon Brandner
ccaa69b25b
Remove unnecessary code
This somehow doesn't seem to be neccessary anymore, I don't really know why but everything seems to work without it

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 08:53:42 +02:00
Šimon Brandner
29d20b8125
Use AccessibleTooltipButton
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 08:11:11 +02:00
Michael Telatynski
0ef9ea76e1 delint unused imports 2021-08-11 23:38:48 +01:00
Michael Telatynski
4f47907abf Show disabled spaces section in preferences regardless 2021-08-11 23:33:10 +01:00
Michael Telatynski
09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y 2021-08-11 23:18:52 +01:00
Michael Telatynski
69cf64249f add comment 2021-08-11 21:50:26 +01:00
Michael Telatynski
38dbe89316 Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
2021-08-11 20:53:41 +01:00
Michael Telatynski
5f54abc7e5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-08-11 20:51:47 +01:00
Šimon Brandner
012f2c9e7e
This doesn't need to be here as it was moved into CallViewButtons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 19:16:55 +02:00
David Baker
abba7983ce
Merge pull request #6578 from SimonBrandner/task/export-call-view-buttons
Move Call View Buttons into a separate component
2021-08-11 18:09:48 +01:00
James Salter
cc9ddb351f Remove test error on startup, and send correct user text 2021-08-11 18:01:22 +01:00
James Salter
ba1618812c Send user text as context 2021-08-11 18:00:21 +01:00
James Salter
de398f46f4 initial spike 2021-08-11 18:00:21 +01:00
Travis Ralston
a149108a7d
Merge pull request #6353 from SimonBrandner/feature/improved-composer
Improve handling of pills in the composer
2021-08-11 10:55:13 -06:00
Michael Telatynski
54d85a3864 Iterate PR based on feedback 2021-08-11 16:32:48 +01:00
Michael Telatynski
be85dcd1bf Delabs Spaces, keeping it as a default-on preference for the time being 2021-08-11 14:52:40 +01:00
Šimon Brandner
833a5ee182
Don't set hidden RRs labs setting at account level
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-11 14:37:35 +02:00
Dariusz Niemczyk
723400ace6
Add a comment for weirdly placed div 2021-08-11 10:56:36 +02:00
Michael Telatynski
40cf05a3ce Fix space public share dialog showing atop the space invite dialog 2021-08-11 09:39:59 +01:00
Michael Telatynski
013ccd46ad Fix feedback form in space create menu exploding 2021-08-10 18:24:58 +01:00
Dariusz Niemczyk
c872609ed3
Modify encrypted images loading for better UX
Adds proper react css transition to encrypted images placeholders, so
that we can animate it's entrance and exit properly.
In addition, adds simple css animations file to properly handle all of
the animations in one place, so that it's much easier to properly handle
prefers-reduced-motion media query.
2021-08-10 19:24:17 +02:00
Michael Telatynski
6efb699670 Tweak copy in the space create menu 2021-08-10 16:46:11 +01:00
Michael Telatynski
f98de18427 Add blue beta dot to the space panel create button 2021-08-10 16:45:56 +01:00
David Baker
50aa3d6c46 Upscale thumbnails to the container size
Force thumbnails to be the size of the container, even if that means
upscaling them. As per comment, this will mean that the thumbnails
will sometimes be larger and a bit blurry rather than small. It looks
like this was probably a source of scroll jumps before.

As per comment, a better fix would be to be be able to know what
size thumbnails the HS will give us so we can size the containers
appropriately.

Type: defect
Regressed by: https://github.com/matrix-org/matrix-react-sdk/pull/6514
Fixes https://github.com/vector-im/element-web/issues/18307
2021-08-10 15:14:04 +01:00
Germain Souquet
d971802789 Create ThreadView phase in RightPanel 2021-08-10 14:30:12 +02:00
Michael Telatynski
065dbf3695 Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-08-10 11:38:38 +01:00
Michael Telatynski
77cf5bf613 Update space create menu copy and add link to community migrator 2021-08-10 11:30:00 +01:00
Michael Telatynski
d90321d813 Iterate PR, merge types with @types/PushRules 2021-08-10 11:03:03 +01:00
Michael Telatynski
6877c8fe0c
Merge pull request #6587 from matrix-org/t3chguy/fix/18465
Fix create room dialog in spaces no longer adding to the space
2021-08-10 10:34:26 +01:00
Michael Telatynski
cd1b315ed6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/12 2021-08-10 10:21:01 +01:00
Michael Telatynski
b7246404be Fix create room dialog in spaces no longer adding to the space 2021-08-10 10:05:19 +01:00
Michael Telatynski
195b8714fc Iterate PR based on feedback 2021-08-10 09:55:51 +01:00
Michael Telatynski
db951b43a3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-10 09:48:22 +01:00
Michael Telatynski
857bb9db44 Add some treeview labels 2021-08-10 09:46:25 +01:00
Michael Telatynski
0f49fe92c6 iterate spaces treeview stuff 2021-08-09 14:01:34 +01:00
Michael Telatynski
09f20bcda7 Make space hierarchy a treeview 2021-08-09 10:29:55 +01:00
Germain
298318c0ee
Merge branch 'develop' into i18n-bracket-fix 2021-08-09 09:07:32 +01:00
Šimon Brandner
96b651e326
Fade buttons after componentDidMount
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:26:57 +02:00
Šimon Brandner
d0e76a0ecd
Use CallViewButtons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:20:17 +02:00
Šimon Brandner
9f28c30145
Add CallViewButtons.tsx
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-08 11:16:55 +02:00
Travis Ralston
92a60497d2
Merge pull request #6572 from matrix-org/travis/voice-messages/stop-left
Move stop button to the left of the waveform
2021-08-07 09:09:21 -06:00
Michael Telatynski
7598ce6ca3
Merge pull request #6576 from SimonBrandner/fix/export-default
Export components by default
2021-08-07 15:15:57 +01:00
Šimon Brandner
d8b492f47d
Correctly hide fullscreen button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 09:38:26 +02:00
Šimon Brandner
63ed852c68
Fix typo which caused the wrong PiP position
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 09:31:32 +02:00
Šimon Brandner
2ce75d45b2
Fix tranlation
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 09:16:34 +02:00
Šimon Brandner
5c90736213
Export components by default
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-07 08:54:40 +02:00
Dariusz Niemczyk
b6f7c4fe95
Merge pull request #6475 from matrix-org/jitsi-picture-in-picture
Refactor Calls components into smaller pieces for future Widgets work
2021-08-06 18:03:30 +02:00
Dariusz Niemczyk
b73c73f07c
Fix missing string 2021-08-06 17:47:59 +02:00
Dariusz Niemczyk
ebee78acc8
Fix dangling ';' 2021-08-06 17:45:14 +02:00
Travis Ralston
b2a2b35243
Merge pull request #6565 from SimonBrandner/fix/codeblock-expand/18388
Fix missing expand button on codeblocks
2021-08-06 09:42:13 -06:00
Travis Ralston
6a9ebc6902
Merge pull request #6390 from SimonBrandner/feature/hidden-rrs
Support for MSC2285 (hidden read receipts)
2021-08-06 09:27:14 -06:00
Travis Ralston
f53451df65
Merge pull request #6349 from SimonBrandner/feature/collapse-pinned-mels/17938
Group pinned message events with MELS
2021-08-06 09:25:08 -06:00
Travis Ralston
cab4f2e402 Move stop button to the left of the waveform
Fixes https://github.com/vector-im/element-web/issues/18416
2021-08-06 09:00:18 -06:00
Dariusz Niemczyk
7513f5ba7c
Fix types 2021-08-06 16:43:20 +02:00
Dariusz Niemczyk
cba87f433b
Fix merge conflicts 2021-08-06 16:31:04 +02:00
Dariusz Niemczyk
4328083ea7
Rename css 2021-08-06 16:31:04 +02:00
Michael Telatynski
6fddfe0d59 Fix dropdown keyboard selection accessibility 2021-08-06 14:48:46 +01:00
Michael Telatynski
3fd2c00516 Improve aria labels around spaces avatar uploader 2021-08-06 14:46:02 +01:00
Germain
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout 2021-08-06 14:45:54 +01:00
Germain
40eb9ae452
Merge pull request #6571 from SimonBrandner/fix/reply-whitespace/18327
Fix clicking whitespaces on replies
2021-08-06 14:34:31 +01:00
Michael Telatynski
7a11279682 Fix dropdown negative wraparound for keyboard accessibility 2021-08-06 14:21:56 +01:00
Michael Telatynski
54fb24f359 Fix dropdown keyboard accessibility when filter is disabled 2021-08-06 14:21:41 +01:00
Travis Ralston
2c601e0ff1
Merge pull request #6562 from matrix-org/travis/voice-messages/disable-composer
Fix disabled state for voice messages + send button tooltip
2021-08-06 07:19:58 -06:00
Šimon Brandner
0e041f2e77
Fix clicking whitespaces on replies
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 15:06:11 +02:00
Michael Telatynski
81b70c6955
Merge pull request #6570 from SimonBrandner/feature/call-length/18405 2021-08-06 13:44:14 +01:00
Šimon Brandner
8368aa13ca
length -> duration
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 14:38:53 +02:00
Dariusz Niemczyk
8ac82457e8
Update src/components/views/voip/PictureInPictureDragger.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 14:10:59 +02:00
Šimon Brandner
c1449ff01a
Show call length
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 13:59:26 +02:00
Dariusz Niemczyk
efc63f1f77
Merge pull request #6560 from matrix-org/palid/fix/18384
Fix [object Object] in Widget Permissions
2021-08-06 13:59:14 +02:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603 2021-08-06 12:56:38 +01:00
Dariusz Niemczyk
6d4ef6b1a4
Fix [object Object] in Widget Permissions 2021-08-06 13:54:00 +02:00
Michael Telatynski
facc882a11 i18n and add space null guard for home space 2021-08-06 12:50:32 +01:00
Dariusz Niemczyk
e8762fbe5b
Fix merge conflicts 2021-08-06 13:28:53 +02:00
Michael Telatynski
1a1b1738c1 Add aria label to clickable notification badge on space panel 2021-08-06 12:28:46 +01:00
Michael Telatynski
3895345250 Fix disabled state on AccessibleButton not being exposed via ARIA 2021-08-06 12:28:20 +01:00
Dariusz Niemczyk
35386078a4
Post-merge changes 2021-08-06 13:25:27 +02:00
Dariusz Niemczyk
3b002c4c1f
Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture
* origin/develop: (100 commits)
  Add comments to isRegionalIndicator
  Stop voice messages that are playing when starting a recording
  Properly set style attribute on shared usercontent iframe
  Fix in-call context menus when in PiP mode (#6552)
  Extract tooltipYOffset to a const
  Increase yOffset by 4px away
  i18n
  Post-merge conflict resolution and improve alignment of tooltips
  Fix image & blurhash info when skipping thumbnail due to thresholds
  Skip sending a thumbnail if it is not a sufficient saving over the original
  Null guard space inviter to prevent the app exploding
  Remove seams from pin icon
  Appease Jest
  Fix worklet reference for new webpack pipeline
  i18n
  Update copy
  Fix wrong cursor being used in PiP
  Fix voice feed cut-off
  Use flex-start as it has more universal support
  Wrap cases in {}
  ...
2021-08-06 13:25:14 +02:00
Michael Telatynski
f7818e0169 iterate PR based on feedback 2021-08-06 12:05:14 +01:00
Michael Telatynski
64995dfae7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-06 11:39:24 +01:00
Šimon Brandner
6afd75ac3c
Update/fix licenses
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:40:26 +02:00
Šimon Brandner
25c6b216b0
Move LayoutSwitcher CSS to a separate file
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:37:42 +02:00
Šimon Brandner
186acf92a9
Wrap in ()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:30:38 +02:00
Šimon Brandner
85f5ec3a94
Move LayoutSwitcher into a separate component
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 10:27:18 +02:00
Šimon Brandner
67fdbf97e5
Round percentageOfViewport
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 09:17:00 +02:00
Šimon Brandner
3677d0c5f2
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer 2021-08-06 08:02:28 +02:00
Šimon Brandner
44acded0a0
Use snake case
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:55:08 +02:00
Šimon Brandner
6e688b3c3a
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn 2021-08-06 07:53:07 +02:00
Šimon Brandner
015e0b6d77
Make into a labs feature
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:51:57 +02:00
Šimon Brandner
4f0c800cad
Merge remote-tracking branch 'upstream/develop' into feature/improved-composer
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:45:17 +02:00
Šimon Brandner
5f68ad92d1
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:43:19 +02:00
Šimon Brandner
3abc419266
Remove spaces and use correct character
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-08-06 07:41:56 +02:00
Šimon Brandner
1e9437db7b
Use correct character
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-08-06 07:41:37 +02:00
Šimon Brandner
94f915a436
Remove spaces
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-08-06 07:41:23 +02:00
Šimon Brandner
67062dab88
Remove spaces
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-08-06 07:40:35 +02:00
Šimon Brandner
717691ef2f
Remove spaces
Co-authored-by: Travis Ralston <travpc@gmail.com>
2021-08-06 07:40:25 +02:00
Travis Ralston
3b73c17465
Merge pull request #6181 from pvagner/voip-a11y
Make call control buttons accessible to screen reader users
2021-08-05 13:36:17 -06:00
Travis Ralston
17a3dc5e6d Stop voice messages that are playing when starting a recording
Fixes https://github.com/vector-im/element-web/issues/18410
2021-08-05 12:44:12 -06:00
Travis Ralston
fea30e5f5f Fix disabled state for voice messages + send button tooltip
Fixes https://github.com/vector-im/element-web/issues/18413
2021-08-05 12:38:15 -06:00
Andrew Morgan
df888a1886
Fix in-call context menus when in PiP mode (#6552)
Mounting them as children when in PiP mode doesn't work. Condition mounting
the context menus as children of the current component based on whether PiP
mode is active.
2021-08-05 16:33:22 +01:00
Travis Ralston
280c017238
Merge pull request #6530 from matrix-org/travis/voice-messages/uploading
Improve voice messages uploading state
2021-08-05 08:36:53 -06:00
Travis Ralston
51bd740936
Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21
Polish up more of the voice messages UI
2021-08-05 08:34:31 -06:00
Michael Telatynski
b860acca80 Extract tooltipYOffset to a const 2021-08-05 14:43:44 +01:00
Michael Telatynski
e1b62ae38b Increase yOffset by 4px away 2021-08-05 14:20:31 +01:00
Michael Telatynski
a8b050a385 Post-merge conflict resolution and improve alignment of tooltips 2021-08-05 13:37:23 +01:00
Šimon Brandner
9e4f5719a4
Handle narrow layouts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-05 11:47:58 +02:00
Šimon Brandner
b99e39e011
Merge remote-tracking branch 'upstream/develop' into feature-surround-with 2021-08-04 18:14:38 +02:00
Dariusz Niemczyk
dc88686f9d
Merge pull request #6539 from SimonBrandner/feature/increase-anim-speed/18371
Increase PiP snapping speed
2021-08-04 16:02:47 +02:00
Šimon Brandner
f97f410d09
Unused import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:16:01 +02:00
Michael Telatynski
2d3211ccf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092 2021-08-04 12:14:29 +01:00
Šimon Brandner
3232552715
Merge remote-tracking branch 'upstream/develop' into feature/update-tile-copy/18376 2021-08-04 13:11:36 +02:00
Šimon Brandner
4a1789be53
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 13:04:23 +02:00
Michael Telatynski
a6e5112be0 Offer a way to create a space based on existing community 2021-08-04 10:37:35 +01:00
James Salter
57f5c30af8
Merge pull request #6532 from matrix-org/posthog-analytics
Reinstate Posthog analytics PR fixing type definitions via installing dev dependencies
2021-08-04 09:47:39 +01:00
Germain
a07df5e9d8
Merge pull request #6512 from SimonBrandner/fix/mirroring/5633 2021-08-04 08:51:22 +01:00
Šimon Brandner
d479373af9
Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 09:21:45 +02:00
Šimon Brandner
372cbbfe8e
Increase snapping speed
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-04 08:11:05 +02:00
Travis Ralston
1b9fe46733 Remove unnecessary rescaling of voice waveforms
Fixes https://github.com/vector-im/element-web/issues/18364
2021-08-03 13:51:11 -06:00
Travis Ralston
18b321f8e8 Improve hover states (tooltips) for voice message interactions
Fixes https://github.com/vector-im/element-web/issues/18375
2021-08-03 13:34:04 -06:00
Travis Ralston
32442068cf Use a default waveform when recording to ease component pop-in
Fixes https://github.com/vector-im/element-web/issues/18225
2021-08-03 13:26:27 -06:00
Travis Ralston
c4e6cc7973 Remove debugging 2021-08-03 12:57:16 -06:00
Travis Ralston
7b565db02d Update uploading state designs 2021-08-03 12:52:21 -06:00
David Baker
28f5dc483b Update eslint plugin & fix silly indenting
As per https://github.com/matrix-org/eslint-plugin-matrix-org/pull/15
this caused a bunch of silly indenting to creep in, so this fixes it
back to the previous style.
2021-08-03 17:07:37 +01:00
Dariusz Niemczyk
7487636f90
Fix linter again 2021-08-03 18:00:11 +02:00
Šimon Brandner
65451805a2
Merge remote-tracking branch 'upstream/develop' into fix/mirroring/5633
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 16:06:12 +02:00
Dariusz Niemczyk
b18d03be32
Fix final style issues 2021-08-03 15:21:15 +02:00
Dariusz Niemczyk
8a1def1d26
Update src/components/views/voip/CallView/CallViewHeader.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
08b27a7c82
Update src/components/views/voip/PictureInPictureDragger.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
389d0b2d4a
Another fix for indentation 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
466151a10c
Update src/components/views/voip/CallPreview.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
f592d37f39
Remove widget support for CallViewHeader 2021-08-03 15:21:14 +02:00
Dariusz Niemczyk
a0b0a91d08
Fix ident 2021-08-03 14:03:35 +02:00
Dariusz Niemczyk
838d9105c9
Update src/components/views/voip/CallView/CallViewHeader.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 13:53:49 +02:00
Germain Souquet
54c685bfa8 Migrate LogoutDialog to TypeScript 2021-08-03 13:52:46 +02:00
Dariusz Niemczyk
90c2eb0b92
Update src/components/views/voip/CallView/CallViewHeader.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-03 13:50:00 +02:00
Germain Souquet
81b45f8aa9 Make defaultProps a static property of LogoutDialog 2021-08-03 13:44:14 +02:00
Dariusz Niemczyk
29e9db44a3
Another fix to the TS types 2021-08-03 13:30:14 +02:00
Dariusz Niemczyk
36efa448b2
Fix TS types 2021-08-03 13:24:41 +02:00
Dariusz Niemczyk
ae411b9401
Refactor Call components into smaller pieces 2021-08-03 12:58:09 +02:00
James Salter
dc7aad1abf Revert "Revert "Add support for Posthog Analytics under a labs flag""
This reverts commit c5ea253181.
2021-08-03 11:55:02 +01:00
James Salter
c5ea253181
Revert "Add support for Posthog Analytics under a labs flag" 2021-08-03 07:30:02 +01:00
Travis Ralston
c5d11a9f17 Improve voice messages uploading state
Fixes https://github.com/vector-im/element-web/issues/18226
Fixes https://github.com/vector-im/element-web/issues/18224
2021-08-02 23:29:46 -06:00
David Baker
3ea0571c5f
Merge pull request #6486 from SimonBrandner/feature/muting
Show an avatar/a turned off microphone icon for muted users
2021-08-02 17:20:55 +01:00
James Salter
a65b41be63
Merge pull request #6495 from matrix-org/posthog-analytics
Add support for Posthog Analytics under a labs flag
2021-08-02 14:46:17 +01:00
James Salter
1ca547802f lint 2021-08-02 13:28:56 +01:00
James Salter
4755a81403 Disable analytics when user hasn't opted in or out 2021-08-02 12:23:42 +01:00
Šimon Brandner
44258fd278
Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603 2021-08-02 11:32:57 +02:00
Andrew Morgan
645c128e44
Prevent backspace and delete functionality in the in-call dial pad. (#6522)
Just as one cannot do when there inputting number while
on a call on their phone, it doesn't make much sense to
be able to do so while on a call in Element. The DTMF
tone history should be preserved.
2021-08-02 10:18:35 +01:00
Travis Ralston
711210d16e
Merge pull request #6437 from matrix-org/travis/voice-messages/delabs
Remove voice messages labs flag
2021-08-02 02:02:36 -06:00
Travis Ralston
dd53324981
Merge pull request #6509 from matrix-org/travis/voice-messages/download-2
Improve download interactions
2021-07-30 10:50:27 -06:00
Travis Ralston
bfd96b7e58 Add file size to tooltip 2021-07-30 08:57:56 -06:00
Michael Telatynski
42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093 2021-07-30 12:25:44 +01:00
Michael Telatynski
3c436c9617 update setting naming to match style 2021-07-30 12:20:02 +01:00
Dariusz Niemczyk
7b6536c297
Fix incorrect height for encoded placeholder images 2021-07-30 11:53:56 +02:00
Šimon Brandner
0c30566cae
Fix import
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-30 08:20:36 +02:00
Šimon Brandner
e0df785538
Mirror only usermedia feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-30 08:15:45 +02:00
Travis Ralston
761fb6e1d5 Appease the linter 2021-07-29 16:01:26 -06:00
Travis Ralston
455c103890 Use new getter for content in MFileBody 2021-07-29 15:57:54 -06:00
Travis Ralston
bb1b2d10c8 Fix file name not ellipsizing
Turns out the tooltip component doesn't copy over class names.
2021-07-29 15:55:45 -06:00
Travis Ralston
c322761abb Improve general style per design direction 2021-07-29 15:49:23 -06:00
Travis Ralston
d1e7c79333 Change "Downloading" tooltip to "Decrypting"
Fixes https://github.com/vector-im/element-web/issues/18239
2021-07-29 15:37:09 -06:00
Travis Ralston
fb89b45c06 Unify and improve download interactions
With help from Palid.

This does two major things:
1. Makes the tile part of a file body clickable to trigger a download.
2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed).

The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.
2021-07-29 15:36:50 -06:00
Andrew Morgan
a7c15b2ac0
Fix DialPad and Call Menu buttons not working when a call is fullscreened. (#6496)
This PR:
* Moves the dialpad and hold/transfer menu buttons into the part of the DOM that's included when a call is fullscreen'd.
* Tweaks `ContextMenu` to allow menu content to be mount as a child of the current component, rather than at the root of the DOM (which was not included in the full-screen'd content).

<!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request -->

<!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off -->

`Signed-off-by: Andrew Morgan <andrewm@element.io>`
2021-07-29 17:51:27 +01:00
Michael Telatynski
02dbdc5c0a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
 Conflicts:
	src/components/views/spaces/SpaceTreeLevel.tsx
	src/dispatcher/actions.ts
	src/i18n/strings/en_EN.json
2021-07-29 16:11:16 +01:00
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071 2021-07-29 15:57:26 +01:00
Michael Telatynski
d587ae44af
Merge pull request #6466 from matrix-org/t3chguy/fix/18096 2021-07-29 15:53:57 +01:00
Michael Telatynski
3ee8f607c0 Switch dropdown out for radio interaction when leaving space 2021-07-29 15:50:18 +01:00
Michael Telatynski
251b6eb04e update copy 2021-07-29 15:30:49 +01:00
Šimon Brandner
f0f2d3621e
Fix clicking pills inside replies
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 16:30:07 +02:00
Michael Telatynski
af851f7f44 fix merge conflict resolution issue 2021-07-29 15:24:42 +01:00
Michael Telatynski
493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/spaces/SpaceCreateMenu.tsx
	src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
James Salter
a1ffd240e1 Use .instance pattern 2021-07-29 14:40:18 +01:00
Šimon Brandner
871f1b7a5c
Handle all possible playMedia() in componentDidUpdate()
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:31:25 +02:00
Šimon Brandner
38a1b922bd
Add missing await
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:26:04 +02:00
Šimon Brandner
cb89dd408c
Use mic mute icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 15:05:26 +02:00
Michael Telatynski
ab56a16907
Merge pull request #6458 from matrix-org/t3chguy/fix/18091 2021-07-29 13:20:19 +01:00
Michael Telatynski
08c883ed07 Update all copy of subspace to space 2021-07-29 13:02:07 +01:00
Dariusz Niemczyk
7baa3284e3
Fix grecaptcha regression 2021-07-29 12:39:32 +02:00
Germain Souquet
e140dd6ba1 Merge branch 'develop' into gsouquet/fix-18132 2021-07-29 10:27:00 +02:00
Šimon Brandner
cf973cdb95
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-29 09:06:24 +02:00
Šimon Brandner
ae64765870
playMedia only if necessary
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-29 08:45:32 +02:00
Michael Telatynski
9fb1c8e4cd Iterate PR 2021-07-28 19:33:07 +01:00
Michael Telatynski
ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Michael Telatynski
40493634ae Iterate PR 2021-07-28 19:23:33 +01:00
Michael Telatynski
ed950875e7 Fix space hierarchy not updating when user mutates it 2021-07-28 19:08:59 +01:00
Michael Telatynski
5d9e421de0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 2021-07-28 17:58:34 +01:00
Michael Telatynski
a5606c72de Update feedback prompt to match designs 2021-07-28 17:56:57 +01:00
James Salter
07eaee25d2 Default properties to {} to avoid passing it superfluously for events with no properties 2021-07-28 17:54:35 +01:00
Michael Telatynski
6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Michael Telatynski
67ef263940 Refactor SpaceButton to be more reusable and add context menu to Home button 2021-07-28 17:40:33 +01:00
Michael Telatynski
b3a28bde89 Factor out useEventEmitterState hook 2021-07-28 17:39:56 +01:00
Michael Telatynski
cdf0d98c3f Fix IconizedContextMenuCheckbox layout 2021-07-28 17:39:02 +01:00
James Salter
b1bd5f57a4 Document IEvent.properties, fix IWelcomeScreenLoad
IEvent.properties is a placeholder that needs to be overriden by extenders for type validation to take place.

IWelcomeScreenLoad should have had properties declared for it. Because it didn't, a faulty call using it was possible.
2021-07-28 16:43:13 +01:00
Šimon Brandner
e0762827fe
Fix typo
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 17:19:32 +02:00
Šimon Brandner
168a32902e
Remove additional word
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:50:40 +02:00
Šimon Brandner
9ec4507da5
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:49:03 +02:00
Šimon Brandner
537ce40f42
Add a TODO
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 16:32:55 +02:00
Michael Telatynski
07b9d6b30b Fix styling of setting flag descriptions in preferences
and add description to spaces all/home setting
and make it an account setting rather than device one
and hide it from the Beta card
2021-07-28 14:39:19 +01:00
Šimon Brandner
7c4e3efbff
Extend PureComponent to avoid unnecessary renders
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 15:11:31 +02:00
Šimon Brandner
91e65534fa
await setState to avoid races where we would try to play media without an HTMLVideoElement
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 15:04:33 +02:00
Šimon Brandner
e445c9c3ff
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-28 13:28:11 +02:00
James Salter
bd7e2dee3d Merge remote-tracking branch 'origin' into posthog-analytics 2021-07-28 11:13:22 +01:00
Germain
771dda0341
Merge pull request #6472 from SimonBrandner/fix/call-view/18221 2021-07-28 11:10:37 +01:00
James Salter
1d81bdc6f9 Interface changes and anonymity fixes 2021-07-28 09:37:08 +01:00
Michael Telatynski
98f3a5120c
Merge pull request #6492 from matrix-org/t3chguy/fix/18275.1 2021-07-28 09:10:00 +01:00
Michael Telatynski
52e50863f8 Fix CreateRoomDialog exploding when making public room outside of a space 2021-07-28 08:39:59 +01:00
Michael Telatynski
0a9d3302ba Fix home vs all rooms requiring app reload and change default to home
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
Šimon Brandner
5f6a1e336e
Remove unnecessary curly braces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:46:19 +02:00
Šimon Brandner
9761c38f3d
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:39:22 +02:00
Germain
f82744db97
Merge pull request #6487 from matrix-org/gsouquet/fix-18265 2021-07-27 17:20:02 +01:00
Germain
7e453d7745
Typo
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-27 17:14:39 +01:00
Šimon Brandner
bc11e215b8
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 18:14:23 +02:00
Šimon Brandner
36607fa8a2
Fix call crashing because element was undefined
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 18:05:50 +02:00
Germain Souquet
30ce7b5eab Make link within replies clickable 2021-07-27 17:57:46 +02:00
Šimon Brandner
6f77d3bbab
Correctly hide the dialpad
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 17:52:13 +02:00
Šimon Brandner
8294d324e3
Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221 2021-07-27 16:55:59 +02:00
Šimon Brandner
371de23b00
Merge remote-tracking branch 'upstream/develop' into feature/muting 2021-07-27 16:40:47 +02:00
David Baker
3e7aee3a87
Merge pull request #5992 from SimonBrandner/fix/12652/screen-share
Add support for screen sharing in 1:1 calls
2021-07-27 15:34:27 +01:00
Šimon Brandner
b9e305daae
Delete mistake line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:26:46 +02:00
Šimon Brandner
24f0c760ce
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 16:25:38 +02:00
Travis Ralston
93f42182c0
Merge pull request #6479 from matrix-org/travis/voice-messages/fix-placeholder-ui
Fix timing of voice message recording UI appearing
2021-07-27 08:05:28 -06:00
Michael Telatynski
39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
David Baker
5ead53b36a
Merge pull request #6483 from SimonBrandner/fix/dont-anim-resize/18261
Fix PiP resize issues
2021-07-27 14:42:04 +01:00
Šimon Brandner
f532c302b6
Don't animate when resizing and move when the PiP changes size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 15:31:54 +02:00
Šimon Brandner
001490f70d
Fix unused resize listener
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 15:30:44 +02:00
Šimon Brandner
5dd34de5fe
Handle mute state changes
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-27 14:31:42 +02:00
Germain Souquet
8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
Germain
788abac74d
Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216
Fix VoIP event tile issues
2021-07-27 08:17:31 +01:00
Travis Ralston
7f01e31040 Fix timing of voice message recording UI appearing
Fixes https://github.com/vector-im/element-web/issues/18223

We delay the composer's state until a recording is truly ready here, preventing buttons from disappearing while we're still figuring things out.
2021-07-26 23:33:21 -06:00
Šimon Brandner
29b0d03fe4
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 21:27:22 +02:00
Germain Souquet
486d576b23 Merge branch 'develop' into gsouquet/fix-18132 2021-07-26 15:49:55 +02:00
Michael Telatynski
737aa1c55d delint 2021-07-26 12:41:52 +01:00
Michael Telatynski
2114e854f9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
Germain
c7bbb497f9
Merge branch 'develop' into gsouquet/fix-18128 2021-07-26 07:41:42 +01:00
Germain
93ae5c20d6
Merge pull request #6464 from matrix-org/gsouquet/fix-18172
Fix reactions row pushing content on IRC layout
2021-07-26 07:40:49 +01:00
Šimon Brandner
3ef20174f3
Fix issues with the controls disappearing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 18:11:29 +02:00
Šimon Brandner
1754602613
Increase CONTROLS_HIDE_DELAY
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:30:59 +02:00
Šimon Brandner
03a8308ae8
Fix call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:24:18 +02:00
Šimon Brandner
a8d27746b4
Show dialpad only when PSTN supported
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:07:18 +02:00
Šimon Brandner
a2c7035163
Tweak copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:57:46 +02:00
Šimon Brandner
f7087d5148
Add declined state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:30:53 +02:00
Šimon Brandner
4784ddc175
Add state for when the remote doesn't pick up
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:57:29 +02:00
Šimon Brandner
aedd535c92
Correct iconography for missed calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:37:25 +02:00
Šimon Brandner
50c27ebed7
Add myself to the license header as I need to re-run the CI
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:16:55 +02:00
Šimon Brandner
b762303102
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:10:01 +02:00
Šimon Brandner
410928745f
IncomingCallBox -> IncomingCallToast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:46:22 +02:00
Šimon Brandner
ff37b8cc79
Remove IncomingCallBox
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 12:47:30 +02:00
Michael Telatynski
22339688cb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/12
 Conflicts:
	src/components/structures/InteractiveAuth.js
2021-07-23 23:43:48 +01:00
Michael Telatynski
64e3c72f65 Fix bad import due to naming clash 2021-07-23 18:51:27 +01:00
Michael Telatynski
70d8378a66 delint 2021-07-23 18:50:25 +01:00
Michael Telatynski
05a9023bac delint and tidy code 2021-07-23 18:31:31 +01:00
Michael Telatynski
1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
2021-07-23 18:28:21 +01:00
Michael Telatynski
869a5fb5c7
Merge pull request #6467 from matrix-org/t3chguy/fix/18110 2021-07-23 18:21:43 +01:00
Michael Telatynski
e78a1adb6f
Merge pull request #6459 from matrix-org/t3chguy/eslint1 2021-07-23 16:23:38 +01:00
Michael Telatynski
4fe0e216d6 Use div instead of span for mx_MImageBody to not violate spec 2021-07-23 16:22:35 +01:00