imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
37543 commits 222 branches 563 tags 470 MiB
Commit graph

5608 commits

Author SHA1 Message Date
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