Commit Graph

5663 Commits (6d0af83df4be4e8522290fb417e930dc0c5def80)

Author SHA1 Message Date
Germain Souquet 54a0a869bf PR feedback 2021-08-24 09:09:28 +01:00
Travis Ralston a0dc5d2987 Honour user-selected background image from settings
Fixes https://github.com/vector-im/element-web/issues/18705

This is provided as an easter egg, but more importantly as an a11y workaround.
2021-08-23 20:39:46 -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 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
Germain Souquet 34da07f1f9 Pass room to ThreadView over roomId 2021-08-23 17:31:23 +01:00
Dariusz Niemczyk 7dfe57833a
Fix GroupFilterPanel not having proper backdrop 2021-08-23 16:57:24 +02:00
Dariusz Niemczyk 92aa953934
Make eslint happy 2021-08-23 16:28:24 +02:00
Dariusz Niemczyk ca92101c72
Optimize and rewrite backdrop rendering 2021-08-23 16:20:21 +02:00
Dariusz Niemczyk 51b5b0145b
Fix resizer on LoggedInView 2021-08-23 16:18:40 +02:00
Germain Souquet 9facb0d963 Polish UI 2021-08-23 14:44:44 +01:00
Dariusz Niemczyk b1a2f16e43
optimize 2021-08-23 13:03:09 +02:00
Germain Souquet 393bd4871f Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-23 10:15:35 +01:00
Dariusz Niemczyk 0daa6ab845
Merge pull request #6648 from matrix-org/palid/fix/modern-layout
Fix modern layout
2021-08-23 10:18:49 +02:00
Travis Ralston 397a0f7849
Merge pull request #6651 from SimonBrandner/feature/watch-rl-background
Watch `RoomList.backgroundImage`
2021-08-22 23:49:32 -06:00
Dariusz Niemczyk 99a935534c
test 2021-08-22 13:08:33 +02:00
Dariusz Niemczyk 0ddb71a4fe
Optimize backdrop blur 2021-08-22 13:05:23 +02:00
Dariusz Niemczyk 86b6c6a836
Fix room views not having proper container 2021-08-20 16:32:56 +02:00
Šimon Brandner 74d79ff205
Watch RoomList.backgroundImage
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-20 15:55:52 +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 fd3787ce82
Fix modern layout 2021-08-20 13:03:08 +02:00
Dariusz Niemczyk 3f1c35d71c
Fix backdrop panel empty image 2021-08-19 19:26:19 +02:00
Dariusz Niemczyk f5a284a1f0
Fix flex values after blur changes 2021-08-19 16:10:09 +02:00
Germain Souquet d5356361a9 Hide thread UI behind experimentalThreadSupport flag 2021-08-19 14:56:51 +01:00
Germain Souquet ac0412d238 rename feature flag for Threads 2021-08-19 12:25:29 +01:00
Germain Souquet ffc7326b0c Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-19 10:44:32 +01:00
Dariusz Niemczyk f50d9b729f
Update src/components/structures/auth/ForgotPassword.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-19 10:08:42 +02:00
Dariusz Niemczyk 01ecdd2e6b
Update src/components/structures/auth/ForgotPassword.tsx
Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-19 10:08:37 +02:00
Dariusz Niemczyk b9604d1fb5
Make ForgotPassword UX slightly more user friendly 2021-08-19 09:12:52 +02:00
Dariusz Niemczyk fa03b10409
Fix missing type for state 2021-08-19 08:23:33 +02:00
Dariusz Niemczyk fe1d0e66fe
Remove useless constructor 2021-08-19 07:14:28 +02:00
Dariusz Niemczyk 468bb5cdcf
Fix mr comments 2021-08-19 07:14:13 +02:00
Dariusz Niemczyk d65f6dd002
Fix bad merge 2021-08-19 07:11:40 +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
David Baker 90a6f251c7
Merge pull request #6627 from SimonBrandner/fix/voip
Properly fix VoIP issues
2021-08-18 18:14:16 +01:00
Dariusz Niemczyk 6310949bc8
Fix background blur not being shown on first load 2021-08-17 19:45:52 +02:00
Dariusz Niemczyk b1c724ad66
Fix invalid width for blurred sidebar 2021-08-17 19:34:18 +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 78d48b1d8b
Fix weird code style 2021-08-17 18:03:22 +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
Dariusz Niemczyk bdb5f3bb9f
Refactor GroupFilterPanel to typescript 2021-08-17 15:30:24 +02:00
James Salter 834f72a9a8 Merge remote-tracking branch 'origin' into sentry-rageshakes 2021-08-17 11:47:00 +01: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
Germain Souquet e5024c4b71 Adapt threading UI to new backend 2021-08-17 10:38:09 +01:00
Šimon Brandner 533f2c2c98
Properly listen for call_state
The previous thing should have never worked, since CallsChanged doesn't get emitted when a call is answered

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-17 09:51:48 +02:00
Šimon Brandner 3fdf4d13ca
Proper init in constructors
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-17 09:48:25 +02:00
Dariusz Niemczyk 582b5c90a4
Properly sepearate left column from timeline 2021-08-16 14:26:21 +02:00
James Salter 16d02f24bd lint 2021-08-16 13:06:19 +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
Germain Souquet 800b3f1424 Fix linter 2021-08-16 09:16:02 +01:00
Dariusz Niemczyk 94a5013beb
temp 2021-08-13 19:03:20 +02: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
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
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 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
Michael Telatynski 09ffad96ff
Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y 2021-08-11 23:18:52 +01:00
Michael Telatynski 5d98c6f02d Iterate PR based on feedback 2021-08-11 21:45:49 +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 de398f46f4 initial spike 2021-08-11 18:00:21 +01:00
Michael Telatynski 38645d9054 Fix loading state issues for spaces pagination 2021-08-11 17:07:53 +01:00
Michael Telatynski d74e9c4f90 Remove impossible space hierarchy size string 2021-08-11 16:47:14 +01:00
Michael Telatynski da110855f0 delint and remove groups-specific tests and setups 2021-08-11 15:36:35 +01:00
Michael Telatynski cbd6f2de44 Tweak copy on space preview 2021-08-11 15:03:38 +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
Germain Souquet d971802789 Create ThreadView phase in RightPanel 2021-08-10 14:30:12 +02:00
Michael Telatynski d90321d813 Iterate PR, merge types with @types/PushRules 2021-08-10 11:03:03 +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 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
Panagiotis 1c7a89b2e4 add comment - explain conditional statusBar 2021-08-08 21:00:15 +03:00
Panagiotis a53886a630 Merge branch 'develop' into fix/call-search-areas 2021-08-08 16:29:05 +03: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
Germain da79581744
Merge pull request #6567 from SimonBrandner/fix/connecting-states/18404
Don't flash "Missed call" when accepting a call
2021-08-06 14:42:31 +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
Šimon Brandner c1449ff01a
Show call length
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 13:59:26 +02:00
Michael Telatynski d285a45da5 Fix stray tabIndex on AutoHideScrollbar component in FF 2021-08-06 12:28:06 +01:00
Šimon Brandner 6d6fa46541
Add connecting states
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 12:42:38 +02: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 44acded0a0
Use snake case
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-06 07:55:08 +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 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
Michael Telatynski a9d7d01014 Null guard space inviter to prevent the app exploding 2021-08-05 12:30:22 +01: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
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
Š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
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
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
Michael Telatynski 42d6afd4b1
Merge pull request #6497 from matrix-org/t3chguy/fix/18093 2021-07-30 12:25:44 +01:00
Michael Telatynski 1c2dc13fa3 factor our observer hook 2021-07-30 12:12:49 +01:00
Michael Telatynski 9eb0986353 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
 Conflicts:
	src/i18n/strings/en_EN.json
2021-07-30 11:34:52 +01:00
Michael Telatynski f4ed9aeef1 Add pagination mechanism to SpaceHierarchy based on IntersectionObserver 2021-07-30 11:02:22 +01:00
Michael Telatynski 259627fba2 Clean up SpaceHierarchy 2021-07-30 11:01:49 +01: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 d459dbe700 Refactor Space Hierarchy stuff in preparation for pagination 2021-07-29 17:35:15 +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 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
Michael Telatynski 08c883ed07 Update all copy of `subspace` to `space` 2021-07-29 13:02:07 +01:00
Michael Telatynski 56cd0e1c4f Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
 Conflicts:
	src/components/structures/SpaceRoomDirectory.tsx
2021-07-29 12:52:01 +01:00
Michael Telatynski 6f37e8b223 Use getChildren instead of getSpaceSummary as MSC2946 has moved on 2021-07-29 12:16:59 +01:00
Michael Telatynski 67b8c0a811 remove unused import 2021-07-28 19:33:54 +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 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
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
James Salter bd7e2dee3d Merge remote-tracking branch 'origin' into posthog-analytics 2021-07-28 11:13:22 +01:00
James Salter 1d81bdc6f9 Interface changes and anonymity fixes 2021-07-28 09:37:08 +01: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
David Baker 7733ee2578
Merge pull request #6478 from matrix-org/dbkr/scrollpanel_loop_breaker
Fix infinite pagination loop when offline
2021-07-27 13:54:30 +01:00
Germain Souquet 8104ba936c Add data-layout to MELS for better CSS structure 2021-07-27 11:30:25 +02:00
David Baker e5d538412b
Typo
Co-authored-by: Germain <germain@souquet.com>
2021-07-27 09:29:32 +01:00
David Baker f20da6d3de Fix infinite pagination loop when offline
I'm not really sure how this is meant to work - and I'm not sure
how it was working before, but this is causing fairly bad infinite
loops if I start element with no homeserver connection. This is
a fairly crude fix, only thing I can think that would be better is
some awareness of when network requests were failing and intentionally
backing off.

Fixes https://github.com/vector-im/element-web/issues/18242
2021-07-26 22:05:35 +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
Šimon Brandner 40947a2a68
Simplifie toast handling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
Šimon Brandner f63b6fc0a9
Support for getting reject info
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:28:27 +02:00
panoschal 05fa90e7e6
Merge branch 'matrix-org:develop' into fix/call-search-areas 2021-07-24 19:16:10 +03:00
Panagiotis 153eb05561 lint 2021-07-24 19:00:47 +03:00
Panagiotis e9efc95712 lint 2021-07-24 16:10:51 +03:00
Šimon Brandner 07be6dd780
Allow suppliing whole body to toasts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:35:54 +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 70d8378a66 delint 2021-07-23 18:50:25 +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
James Salter 5e0a397631 Refactor anonymity derivation 2021-07-23 17:58:31 +01:00
Michael Telatynski dec2c48155 remove unused import and revert removing some needed css 2021-07-23 15:56:00 +01:00
Michael Telatynski 1d1a396c1f get rid of spurious hr 2021-07-23 15:51:59 +01:00
Michael Telatynski 9c7fa71a4a Remove spaces beta feedback prompts except a couple more strategic ones 2021-07-23 15:07:24 +01:00
Michael Telatynski 5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx
2021-07-23 10:42:46 +01:00
Michael Telatynski f5630acea7 Adhere to better eslint rules 2021-07-23 10:35:10 +01:00
Michael Telatynski 358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01:00
panoschal 8a28611a9a
Merge branch 'develop' into fix/call-search-areas 2021-07-23 10:50:33 +03:00
Michael Telatynski 010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +01:00