mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 18:41:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
33923 commits 219 branches 562 tags 474 MiB
Commit graph

39 commits

Author SHA1 Message Date
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Travis Ralston
951fbf4a1a fix import 2021-06-14 13:38:43 -06:00
Michael Telatynski
93eb9feaa7 iterate PR based on feedback 2021-06-08 16:42:58 +01:00
Michael Telatynski
0c97d90fb9 Iterate PR based on feedback 2021-06-03 16:44:28 +01:00
Michael Telatynski
f2643151c6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-03 16:22:59 +01:00
Germain Souquet
d7a5547d80 use Intl.Collator over String.prototype.localeCompare for better performance 2021-06-02 10:42:17 +01:00
Michael Telatynski
91b7f25513 delint2 2021-05-28 13:51:54 +01:00
Michael Telatynski
d319768b2e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-05-28 13:06:48 +01:00
Nique Woodhouse
ea26393709 Styling amends to accommodate the invite dialog footer 2021-05-28 13:00:18 +01:00
Michael Telatynski
eef15394f2 extract buildRecents return type into an interface 2021-05-27 17:00:48 +01:00
Michael Telatynski
f75fb3b349 Add footer and privacy note to the start dm dialog 2021-05-27 15:51:25 +01:00
Michael Telatynski
60d161caf5 Apply some actual typescripting to this file 2021-05-26 16:47:46 +01:00
Michael Telatynski
3f10279e15 Invite Dialog don't show warning modals after unmount, it is jarring 2021-05-26 16:38:02 +01:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Germain Souquet
3a91dff711 Check if address type is mx-user-id 2021-04-15 14:13:37 +01:00
Germain Souquet
3b66821258 move DM invite responsiblity to the server side 2021-04-14 19:59:17 +01:00
Germain Souquet
8b2dc22fe1 fix closing modal when finished 2021-04-14 09:37:06 +01:00
Germain Souquet
f89bbea3f1 Ensure room is synced with account before sending invites 2021-04-14 09:03:47 +01:00
Germain Souquet
8d95c012ef refactor _startDm invite flow to use async/await 2021-04-14 08:44:33 +01:00
J. Ryan Stinnett
bef5c6593e Remove key sharing feature flag 2021-04-09 17:05:55 +01:00
David Baker
299467c515 Merge remote-tracking branch 'origin/develop' into dbkr/attended_transfer 2021-03-31 10:14:48 +01:00
David Baker
989d69ba16 Get tbe transfer target / transferee the right way around 
and also switch to the transfer target's room when we call them
 2021-03-26 14:21:58 +00:00
Hubert Chathi
db2f573410 Merge branch 'develop' into room-history-key-sharing2 2021-03-25 19:28:50 -04:00
Hubert Chathi
46fd549ace update with new suggested design 2021-03-25 19:27:14 -04:00
David Baker
82ba546142 WIP attended transfer 2021-03-25 19:56:21 +00:00
Germain Souquet
510f08e9f1 Update failed invites copy 2021-03-25 10:11:52 +00:00
Germain Souquet
b8692bdf17 Prevent state to be toggled whilst a request is pending 2021-03-23 18:25:03 +00:00
Hubert Chathi
727c189456 apply changes from review 2021-03-19 16:55:07 -04:00
Jaiwanth
70e0b77fc4 Changed invite phrases in context menu and invite dialog 2021-03-19 21:32:52 +05:30
Hubert Chathi
7f141276ff initial work on room history key sharing, take 2 2021-03-15 22:56:56 -04:00
Travis Ralston
fa5d98c319 Convert cases of getHttpUriForMxc to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
e5180a472f Merge branch 'develop' into travis/skinning/pt3-easy-comps 2021-03-10 12:30:06 -07:00
Travis Ralston
c359dff738 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:34 -07:00
Michael Telatynski
d9a801910a Tweak spaces copy 2021-03-03 11:34:29 +00:00
Michael Telatynski
c10512fd56 Initial SpaceRoomView work 2021-03-01 18:53:11 +00:00
David Baker
a33be00c08 Basic call transfer initiation support 
Adapt the InviteDialog to select a transfer target

Doesn't support supplying a roo mID fr the transfer: just leaves
the transferee to work out how to contact the target themselves.

MSC2747 (matrix-org/matrix-doc#2747)
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1558
 2020-12-15 14:59:06 +00:00
David Baker
2d36910577
Add comment 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2020-12-14 22:52:30 +00:00
David Baker
df825792bc These can just all be Members 2020-12-14 22:51:40 +00:00
David Baker
32f693e3b0 Convert InviteDialog to TypeScript 
Before I start using it to select VoIP transfer targets
 2020-12-14 22:28:21 +00:00
Renamed from src/components/views/dialogs/InviteDialog.js (Browse further)