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
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
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
Germain Souquet
02b08888b5
Use modern layout in file and notification panel
2021-07-22 16:00:41 +02:00
Michael Telatynski
18bb4bce35
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
Šimon Brandner
2df4f7b859
Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938
2021-07-22 07:51:58 +02:00
Šimon Brandner
e7c5711bb7
membershipTypes -> groupedEvents
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-22 07:45:48 +02:00
Travis Ralston
c384575375
Merge pull request #6261 from robintown/watch-show-timestamps
...
Add alwaysShowTimestamps and others to RoomView setting watchers
2021-07-21 19:44:04 -06:00
James Salter
c34afdb4bd
Refactor platform properties loading
2021-07-21 18:35:25 +01:00
James Salter
f358deb6c4
Manually track page views
2021-07-21 16:52:57 +01:00
Germain Souquet
26ca41f699
Cache room member count on the messagePanel
2021-07-21 17:26:41 +02:00
James Salter
34f8c60b34
Hook analytics into the SDK
2021-07-21 16:15:18 +01:00
Germain Souquet
43d62aa8c1
Use more performant getMembersCount to decide to hide or show sender
2021-07-21 16:43:57 +02:00
Germain Souquet
e5bc5a933e
Use cached value to read member count
2021-07-21 16:10:18 +02:00
Germain Souquet
ae51653348
Add null guard for room prop in EventTile
2021-07-21 12:41:02 +02:00
Michael Telatynski
390b05617c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/dialogs/CreateRoomDialog.tsx
src/components/views/dialogs/RoomUpgradeDialog.tsx
src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
Šimon Brandner
dd6379cf4b
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-20 13:15:04 +02:00
Michael Telatynski
d3934ff7da
Merge branch 'develop' into t3chguy/eslint
2021-07-20 11:08:13 +01:00
Michael Telatynski
848b83015d
not sure how these happened :/
2021-07-20 09:37:54 +01:00
Michael Telatynski
e6869797d7
remove unused prop
2021-07-20 09:27:32 +01:00
Germain Souquet
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
Michael Telatynski
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
Michael Telatynski
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
Robin Townsend
c0123f5dad
Merge branch 'develop' into watch-show-timestamps
2021-07-18 11:47:44 -04:00
Šimon Brandner
5c5b79a972
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:13:51 +02:00
Robin Townsend
092fdf5e5e
Be consistent about MessagePanel setting lookups
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 18:46:29 -04:00
Robin Townsend
158e6fa61c
Merge branch 'develop' into text-for-event-perf
2021-07-16 18:24:22 -04:00
Šimon Brandner
16ed5c6645
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-16 21:43:33 +02:00
Michael Telatynski
9d45a3760f
Fix types of the various query params dicts, arrays can be included e.g via
2021-07-16 13:11:43 +01:00
James Salter
b55f69a74c
Merge pull request #6374 from matrix-org/copy-room
...
Add "Copy Link" to room context menu
2021-07-16 11:14:00 +01:00
James Salter
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
James Salter
685b59235d
Make error message consistent with menu title
2021-07-16 09:24:46 +01:00
Šimon Brandner
651f19fb9b
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
2021-07-16 10:21:30 +02:00
Michael Telatynski
1437188282
Also move effects handling from event
to Room.timeline
to wake up less
2021-07-15 18:02:02 +01:00
Michael Telatynski
b0053f36d3
Fix instances of event.sender being read for just the userId - this field may not be set in time
2021-07-15 17:43:24 +01:00
Michael Telatynski
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console
2021-07-15 13:50:13 +01:00
Michael Telatynski
7c3c04d340
Fix instances of setState calls after unmount
2021-07-15 12:10:54 +01:00
Michael Telatynski
50b6c5c557
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +01:00
Michael Telatynski
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Michael Telatynski
ebfe38dc4a
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-07-15 09:59:40 +01:00
Andrew Morgan
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com>
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Co-authored-by: David Baker <dbkr@users.noreply.github.com>
2021-07-15 09:55:58 +01:00
Michael Telatynski
90d380c8ae
Cache value of feature_spaces* flags as they cause page refresh so are immutable
2021-07-15 08:26:49 +01:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
Germain Souquet
dde58d449d
Only hide sender when in bubble mode
2021-07-14 17:16:13 +02:00
James Salter
2fe5ad5d4b
Slightly refine error message
2021-07-14 15:07:22 +01:00
James Salter
8bf5e61acc
Add "Copy" to room context menu.
...
This menu item creates a matrix.to link for the room and copies it to the clipboard.
2021-07-14 14:58:18 +01:00
Šimon Brandner
226224b039
Allow sending hidden RRs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-14 15:12:35 +02:00
Robin Townsend
8e64b73bd6
Merge branch 'develop' into text-for-event-perf
2021-07-13 23:25:16 -04:00
Paulo Pinto
6884b2aa6d
Standardise spelling of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:28:43 +01:00
Germain Souquet
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
Michael Telatynski
ae6eaa5acc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
...
Conflicts:
src/components/structures/RoomDirectory.tsx
src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
Germain Souquet
8f345dc1ba
Rework backdrop to draw one image with two different level of blur
2021-07-12 13:51:46 +02:00
Germain Souquet
36ba65b534
Merge branch 'develop' into gsouquet/fix-backdrop-filter
2021-07-12 13:00:34 +02:00