PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
38569 commits 1 branch 0 tags 338 MiB
Commit graph

3694 commits

Author SHA1 Message Date
Šimon Brandner
b6ea75b681
Merge remote-tracking branch 'upstream/develop' into task/colors-2 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-24 08:57:12 +02:00
Travis Ralston
32343f3382
Merge pull request #5698 from SimonBrandner/public-e2ee-warn 
Add a warning on E2EE rooms if you try to make them public
 2021-08-23 16:45:47 -06:00
Travis Ralston
15c731d574
Merge pull request #6507 from matrix-org/t3chguy/fix/18089 
Allow pagination of the space hierarchy and use new APIs
 2021-08-23 15:51:34 -06:00
Dariusz Niemczyk
6205cbbdec
Merge pull request #6659 from matrix-org/palid/fix/backdrop-blur 
Optimize background image from avatar on left panel
 2021-08-23 20:05:49 +02:00
Dariusz Niemczyk
618cc70cbd
Make stylelint happy 2021-08-23 19:43:08 +02:00
Dariusz Niemczyk
e54191f6b0
Move background-blur to fully css version 2021-08-23 19:26:57 +02:00
Germain Souquet
edd4d42e7f Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-23 17:31:37 +01:00
Dariusz Niemczyk
01eda5158b
Revert "Make the background-blur always 100%" 
This reverts commit e8c974a71e.
 2021-08-23 17:39:06 +02:00
Dariusz Niemczyk
e8c974a71e
Make the background-blur always 100% 2021-08-23 17:30:02 +02:00
Dariusz Niemczyk
7dfe57833a
Fix GroupFilterPanel not having proper backdrop 2021-08-23 16:57:24 +02:00
Dariusz Niemczyk
ca92101c72
Optimize and rewrite backdrop rendering 2021-08-23 16:20:21 +02:00
Germain Souquet
9facb0d963 Polish UI 2021-08-23 14:44:44 +01:00
Dariusz Niemczyk
a3cf1c1cf0
Merge pull request #6654 from matrix-org/fix/palid/space-room-view-css 
Fix spaces preview screen
 2021-08-23 13:10:15 +02:00
David Baker
b391ee0bbf
Merge pull request #6451 from SimonBrandner/fix/replies-bubble/18184 
Fix replies on the bubble layout
 2021-08-23 11:29:28 +01:00
Germain
1fad454fe0
Merge pull request #6655 from SimonBrandner/fix/autocomplete-scroll 2021-08-23 11:16:02 +01:00
Germain Souquet
393bd4871f Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-23 10:15:35 +01:00
Šimon Brandner
1c93e18c0a
Move CallPreview CSS 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-22 15:22:21 +02:00
Šimon Brandner
d29a18b182
Fix some sizing issue on video feeds 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-22 10:10:05 +02:00
Šimon Brandner
61188561d2
Merge remote-tracking branch 'upstream/develop' into feature/voice-activity 2021-08-22 10:01:17 +02:00
Šimon Brandner
cb7e44f4f5
Always show a transparent border to avoid icon jumps 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-22 09:08:33 +02:00
Šimon Brandner
b58184d61e
Make autocomplete smaller 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-21 19:04:26 +02:00
Šimon Brandner
81d64bec58
Fix autocomplete scrollbar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-21 18:18:53 +02:00
Dariusz Niemczyk
9a3a5a7e63
Fix spaces preview screen 2021-08-21 10:47:34 +02:00
Dariusz Niemczyk
1c29505c83
Merge pull request #6653 from matrix-org/fix/palid/space-room-view-css 
Fix content not being centered
 2021-08-20 18:30:43 +02:00
Dariusz Niemczyk
d9b79888fd
Fix content not being centered 2021-08-20 18:15:57 +02:00
Dariusz Niemczyk
374a0265b3
Merge pull request #6652 from matrix-org/fix/palid/space-room-view-css 
Fix space room view invalid css
 2021-08-20 17:41:26 +02:00
Travis Ralston
3e19fc1984
Merge pull request #6620 from SimonBrandner/feature/vertical-autocomplete/18558 
Format autocomplete suggestions vertically
 2021-08-20 09:10:36 -06:00
Dariusz Niemczyk
86b6c6a836
Fix room views not having proper container 2021-08-20 16:32:56 +02:00
Germain Souquet
30a762944a Implement a very low fidelity UI for threads 2021-08-20 12:11:04 +01:00
Dariusz Niemczyk
7d1e71fea4
Merge pull request #6641 from matrix-org/palid/fix/chat-flex-values 
Fix flex values after blur changes
 2021-08-20 13:10:40 +02:00
Dariusz Niemczyk
67ce081510
Fix one line too much in scss 2021-08-20 13:04:45 +02:00
Jaiwanth
6a26154271 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-20 15:02:13 +05:30
David Baker
ea38990d94
Merge pull request #6647 from SimonBrandner/fix/call-tile-bubbles/18648 
Fix call tiles on the bubble layout
 2021-08-20 09:24:42 +01:00
Šimon Brandner
952fdd04c1
Fix call tiles on the bubble layout 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-20 10:04:40 +02:00
Travis Ralston
fcf47f6539
Merge pull request #6626 from SimonBrandner/fix/correct-colors-call-tiles 
Adjust colors in call tiles
 2021-08-20 00:02:56 -06:00
Dariusz Niemczyk
f5a284a1f0
Fix flex values after blur changes 2021-08-19 16:10:09 +02:00
Germain Souquet
ffc7326b0c Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-19 10:44:32 +01:00
Šimon Brandner
abab31c33b
Add a speaking indicator 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-19 11:42:43 +02:00
Dariusz Niemczyk
939874167a
Merge pull request #6262 from matrix-org/gsouquet/fix-backdrop-filter 
Move backdrop filter to a canvas based solution
 2021-08-19 10:59:49 +02:00
Dariusz Niemczyk
8fe28fe864
Update res/css/structures/auth/_Login.scss 
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-19 09:19:02 +02:00
Dariusz Niemczyk
b9604d1fb5
Make ForgotPassword UX slightly more user friendly 2021-08-19 09:12:52 +02:00
Dariusz Niemczyk
7adfbf6f98
Show blurhash only after 150ms 
Blurhash on every single room entrance was extremely annoying, to the
point where it wasn't really helpful, but distracting, even after
the animations was added.
This commit makes it so the blurhash is only shown after 150ms, and the
image will be animated as a quick fade-in if there's no blurhash.

Fixes https://github.com/vector-im/element-web/issues/18617
Fixes https://github.com/vector-im/element-web/issues/17879
 2021-08-19 07:52:23 +02:00
Dariusz Niemczyk
455a914cf3
Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter 
* origin/develop: (43 commits)
  Update copy to indicate debug logs contain which UI elements you last interacted with
  Fix name of Netlify workflow
  Add type declarations
  Fix pagination and improve typing
  Fix import
  Reset matrix-js-sdk back to develop branch
  v3.28.1
  Prepare changelog for v3.28.1
  Upgrade matrix-js-sdk to 12.3.1
  Explicitly handle first state change
  Properly listen for call_state
  Proper init in constructors
  Resetting package fields for development
  v3.28.0
  Prepare changelog for v3.28.0
  Fix error on accessing encrypted media without keys
  Fix call tile buttons
  Upgrade matrix-js-sdk to 12.3.0
  Remove test code; good job we have tests
  Fix dates
  ...
 2021-08-19 07:11:02 +02:00
Dariusz Niemczyk
e83722e9d9
Fix missing background color in GroupFilterPanel 2021-08-18 13:56:19 +02:00
David Baker
5fa0908752
Merge pull request #6624 from SimonBrandner/fix/call-tile-button/18565 
Fix call tile buttons
 2021-08-18 12:03:18 +01:00
David Baker
24e3a91f6f
Merge pull request #6618 from SimonBrandner/fix/long-names-call-tiles 
Fix long display names in call tiles
 2021-08-18 11:56:09 +01:00
David Baker
3a733d1604
Merge pull request #6616 from SimonBrandner/fix/access-token-overflow 
Avoid access token overflow
 2021-08-18 11:54:40 +01:00
Dariusz Niemczyk
b5178a3ffd
Fix fonts for inputs being of wrong colors 2021-08-17 19:56:10 +02:00
Dariusz Niemczyk
3fd95ad374
Fix missing coma 2021-08-17 19:09:58 +02:00
Dariusz Niemczyk
eb242041a5
Fix missing background tonality without avatar 2021-08-17 18:56:19 +02:00
Germain Souquet
95f4513bd2 Make UI respond to thread events 2021-08-17 17:42:47 +01:00
Dariusz Niemczyk
515fc244b6
Revert useless change 2021-08-17 18:00:39 +02:00
Dariusz Niemczyk
de2eb5b6dd
Satisfy linter 2021-08-17 17:59:26 +02:00
Dariusz Niemczyk
2ee26d0681
Make the blur as-close to the css one as possible 2021-08-17 17:47:40 +02:00
Dariusz Niemczyk
a999cad49d
Properly cache blur effect 2021-08-17 16:07:17 +02:00
Germain Souquet
458f860a26 Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-17 11:14:21 +01:00
Germain Souquet
d1dbfbd014 hide thread events from the timeline 2021-08-17 11:10:02 +01:00
Šimon Brandner
d8f58e95cb
Use the secondary color for all 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 18:41:21 +02:00
Dariusz Niemczyk
a2797795b2
Add proper glass-like look 2021-08-16 16:52:41 +02:00
Dariusz Niemczyk
bad37e65db
Add missing position:relative; 2021-08-16 16:52:32 +02:00
Šimon Brandner
93fee442e6
Fix call tile buttons 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 15:30:45 +02:00
Dariusz Niemczyk
582b5c90a4
Properly sepearate left column from timeline 2021-08-16 14:26:21 +02: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
2ca616c239
Format autocomplete suggestions vertically 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 10:15:54 +02:00
Šimon Brandner
c856d433d6
Trim long display names 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 10:08:16 +02:00
Šimon Brandner
ae19055734
Fix long display names in call toasts 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-16 09:34:28 +02:00
Šimon Brandner
84ad1bec6c
Avoid access token overflow 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-15 14:40:31 +02:00
Jaiwanth
0e3ad652af Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-08-14 00:04:30 +05:30
Jaiwanth
7207329c15 Apply review suggestions 2021-08-13 23:44:07 +05:30
Šimon Brandner
0ee59a17de
Fix PiP of held calls 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-13 18:42:55 +02:00
Michael Telatynski
9d909dcdf8 tweaks 2021-08-13 15:44:43 +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
Michael Telatynski
5e38b8b3b3 try fix tests s'more 2021-08-13 13:29:25 +01: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
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
5ac5640939
Add a little padding 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-13 10:35:31 +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
Šimon Brandner
25a3a8ddfd
$roomlist-header-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
4604d817c4
$roomlist-filter-active-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
8e610e5947
$dialpad-button-bg-color -> $quinary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:31 +02:00
Šimon Brandner
0faedebb92
$roomheader-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:30 +02:00
Šimon Brandner
a3a6f73049
$avatar-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:30 +02:00
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:18:18 +02:00
Šimon Brandner
9ecd3b03f1
$quaternary-fg-color -> $quaternary-content 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:37 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 17:17:34 +02:00
Michael Telatynski
0414ea27b8 Iterate PR based on feedback 2021-08-12 15:53:10 +01:00
Šimon Brandner
7ce88c9966
$toast-bg-color -> $system 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-12 16:20:30 +02:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations 2021-08-12 17:10:13 +05:30
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
Michael Telatynski
85b1f166e8 post-merge tidy up 2021-08-12 12:03:14 +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
0a209afdc2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 
 Conflicts:
	res/css/structures/_SpaceHierarchy.scss
	src/components/structures/SpaceHierarchy.tsx
	src/i18n/strings/en_EN.json
 2021-08-12 11:41:03 +01:00
Michael Telatynski
228d623024
Merge pull request #6543 from matrix-org/t3chguy/fix/18092 2021-08-12 11:28:14 +01:00
Michael Telatynski
9d3569a577 Iterate PR based on feedback 2021-08-12 10:58:56 +01:00
Michael Telatynski
09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y 2021-08-11 23:18:52 +01:00
Travis Ralston
2e6da2dc6e
Merge pull request #6596 from SimonBrandner/fix/scrollbar-dot/18474 
Remove tiny scrollbar dot from code blocks
 2021-08-11 13:54:47 -06: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
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
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
Šimon Brandner
5bc165f2ac
Make scrollbar dot transparent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-11 18:33:16 +02:00
Michael Telatynski
d74e9c4f90 Remove impossible space hierarchy size string 2021-08-11 16:47:14 +01: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
Dariusz Niemczyk
ef3737d179
Add full class names to animations.scss 2021-08-11 10:52:22 +02: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
f98de18427 Add blue beta dot to the space panel create button 2021-08-10 16:45:56 +01:00
Michael Telatynski
1272b375d5 Tweak space panel new/cancel button colouring 2021-08-10 16:45:21 +01:00
Germain Souquet
d971802789 Create ThreadView phase in RightPanel 2021-08-10 14:30:12 +02: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
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
0f49fe92c6 iterate spaces treeview stuff 2021-08-09 14:01:34 +01:00
Jaiwanth
45ce352d02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-08-09 10:44:13 +05:30
Šimon Brandner
d43eac7722
Add bubble highlight styling 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-08 15:00:25 +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
0cad9ed14a
Add _CallViewButtons.scss 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-08 11:15:18 +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
Dariusz Niemczyk
390a3ebcbd
Merge pull request #6579 from SimonBrandner/family-friendly-branch-name 
Fix source picker sizing issues (again)
 2021-08-07 15:50:17 +02:00
Šimon Brandner
54b5c8554a
Fix source picker sizing issues (again) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 12:00:50 +02:00
Šimon Brandner
fe1dfa209a
rethemendex 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-07 10:13:27 +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
Travis Ralston
fbe8f04942 Fix height jump of recording states 
Fixes https://github.com/vector-im/element-web/issues/18431
 2021-08-06 09:04:36 -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
4328083ea7
Rename css 2021-08-06 16:31:04 +02:00
Germain
3153e11761
Merge pull request #6566 from SimonBrandner/task/export-layout 2021-08-06 14:45:54 +01:00
Michael Telatynski
41475a3b94 fix keyboard focus issue around the space hierarchy 2021-08-06 14:12:55 +01:00
Michael Telatynski
381108a9c2
Merge pull request #6227 from SimonBrandner/feature/copy-version/17603 2021-08-06 12:56:38 +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
3c0ac487da
Remove comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 09:06:24 +02:00
Šimon Brandner
f57bffad3c
Soften border color 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-06 09:05:33 +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
6e688b3c3a
Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn 2021-08-06 07:53:07 +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
Travis Ralston
27d7daeceb
Merge pull request #6550 from SimonBrandner/fix/voice-cutoff 
Fix voice feed being cut-off
 2021-08-05 15:46:42 -06:00
Travis Ralston
9ad72d6daf
Merge pull request #6549 from SimonBrandner/fix/dont-use-start 
Use `flex-start` instead of `start`
 2021-08-05 15:46:12 -06:00
Travis Ralston
4dcf2c7038
Merge pull request #6498 from SimonBrandner/fix/screen-picker-sizing/18281 
Fix sizing issues of the screen picker
 2021-08-05 15:39:12 -06: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
Šimon Brandner
443db125a9
Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 14:36:55 +02:00
Šimon Brandner
efeae3a84c
Top align the avatar 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 13:39:39 +02:00
Šimon Brandner
5fa6ef83d2
Fix button alighnment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-08-05 12:35:44 +02: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