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

4483 commits

Author SHA1 Message Date
Germain Souquet
f058fd8869 Reduce amount of DOM nodes 2021-05-20 15:39:25 +01:00
Germain Souquet
171539d42d Simplify EventTile structure 
Only render MessageTimestamp to the DOM when a tile is hovered
 2021-05-20 15:26:02 +01:00
Šimon Brandner
340bbeec4f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-20 15:50:49 +02:00
Germain Souquet
422740f13b normalize displayName 2021-05-20 11:04:17 +01:00
Robin Townsend
678b298bab Merge branch 'develop' into improved-forwarding-ui 2021-05-19 12:39:48 -04:00
Michael Telatynski
aa4984019c
Merge pull request #6061 from jaiwanth-v/update-memberlist-invite 
Update MemberList to reflect changes for invite permission change
 2021-05-19 17:35:58 +01:00
Šimon Brandner
4cbec87092
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 15:21:22 +02:00
Germain
6170403c10
Depile encrypted events to find the most suitable one for preview (#6056) 2021-05-19 13:25:52 +01:00
Jaiwanth
d73eb0c70f Update MemberList.js 2021-05-19 17:46:10 +05:30
Michael Telatynski
78a8c9e10e Fix issue when a room without a name or alias is marked as suggested 2021-05-19 10:46:11 +01:00
Jaiwanth
e78206301f Modify to avoid forceUpdate 2021-05-19 14:31:04 +05:30
Jaiwanth
0d8a7eabc7 Update MemberList on invite permission change 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-19 12:49:55 +05:30
Šimon Brandner
17fad0e9b2
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-05-19 08:46:33 +02:00
Michael Telatynski
e9c258a930 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/autocomplete/AutocompleteProvider.tsx
	src/components/views/rooms/Autocomplete.tsx
 2021-05-18 12:49:11 +01:00
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276 
Decorate room avatars with publicity in add existing to space flow
 2021-05-14 11:23:46 +01:00
Michael Telatynski
6f9c2f05a2 remove unused vars/imports 2021-05-14 10:49:53 +01:00
Travis Ralston
2d2c0d54c0
Merge pull request #6001 from jaiwanth-v/save-edited-state-messages 
Save edited state of a message when switching rooms
 2021-05-13 20:06:31 -06:00
Michael Telatynski
f6e8d38b87 Remove redundant tag prop 2021-05-13 14:23:10 +01:00
Germain
bd2917aa69
Add a limit option for autocomplete results (#6016) 2021-05-12 12:18:56 +01:00
Jaiwanth
240753a84f Check for a pending edit only once per render and clear any pending events while switching between edits 2021-05-11 18:37:57 +05:30
Michael Telatynski
60e7089c77 post-merge fixes, the new keybindings stuff made it messy 2021-05-11 11:14:21 +01:00
Michael Telatynski
60d3da2441 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/a11y/composer-list-autocomplete 
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/components/views/rooms/BasicMessageComposer.tsx
	src/editor/autocomplete.ts
 2021-05-11 10:59:22 +01:00
Jaiwanth
87d95d0cb1 Merge branch 'save-edited-state-messages' of github.com:jaiwanth-v/matrix-react-sdk into save-edited-state-messages 2021-05-11 11:12:32 +05:30
Jaiwanth
4ea3fbc5ba Add comments and newlines back and resolve merge conflicts 2021-05-11 11:07:34 +05:30
Jaiwanth
376befd38e
Update src/components/views/rooms/EditMessageComposer.js 
Co-authored-by: Travis Ralston <travpc@gmail.com>
 2021-05-11 10:37:53 +05:30
Travis Ralston
12657f0fbc Merge branch 'develop' into edit-slashcommands 2021-05-10 20:09:33 -06:00
Travis Ralston
122565b3ac
Update src/components/views/rooms/EditMessageComposer.js 2021-05-10 20:03:20 -06:00
Šimon Brandner
135cdb2255
Add dialog with info about the screensharing change 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 12:37:40 +02:00
Šimon Brandner
2749715050
Remove screensharing call type 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-05-10 12:26:28 +02:00
Jaiwanth
1f77048750 Minor refactor 2021-05-09 16:12:04 +05:30
Jaiwanth
6f98aa06c4 Save edited state when switching rooms 
Signed-off-by: Jaiwanth <jaiwanth2011@gmail.com>
 2021-05-09 13:42:01 +05:30
Robin Townsend
7fa81766db Remove old forwarding code 
This has been replaced by ForwardDialog.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-08 21:11:06 -04:00
Ayush PS
39402ec971 Lint errors 2021-05-07 19:14:29 +05:30
Ayush PS
c843387043 Merge branch 'develop' into Bubble-bericht 2021-05-07 18:32:38 +05:30
Ayush PS
f367d617c5 Added the extra classes 2021-05-07 14:37:28 +05:30
Tulir Asokan
cc919452b5 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-07 00:07:51 +03:00
Michael Telatynski
9518e4d415 Guard all isSpaceRoom calls behind the labs flag 2021-05-05 23:59:07 +01:00
Travis Ralston
54931cb43e Merge remote-tracking branch 'origin/develop' into travis/voicemessages/timeline 2021-05-04 09:05:04 -06:00
Travis Ralston
704edfc05b
Merge pull request #5959 from matrix-org/travis/voicemessages/permissions 
Handle no/blocked microphones in voice messages
 2021-05-04 09:03:38 -06:00
Jaiwanth
29aec4abdb Use middlePanelResized instead of noisy 2021-05-04 15:39:46 +05:30
Travis Ralston
87a57ec7e5 Handle no/blocked microphones in voice messages 
Fixes https://github.com/vector-im/element-web/issues/17139
 2021-05-03 16:41:39 -06:00
Jaiwanth
54e139a6ad Generate previews when the room tile is maximised 2021-05-03 23:17:10 +05:30
Travis Ralston
8abd251ec5 delib 2021-05-03 11:43:46 -06:00
Travis Ralston
d7ed2d3486 Switch to m.audio with extensible events 2021-05-03 10:27:15 -06:00
Jaiwanth
cf9edb1884 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into room-preview-spaces 2021-05-03 21:53:54 +05:30
Tulir Asokan
330f222dd1 Remove redundant code and move presentableTextForFile out of MFileBody 
Signed-off-by: Tulir Asokan <tulir@maunium.net>
 2021-05-01 16:11:30 +03:00
Tulir Asokan
09f9916916 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-05-01 15:37:32 +03:00
Michael Telatynski
0008ef7ab1
Merge pull request #5942 from matrix-org/t3chguy/fix/16998 
Make the text filter search all spaces instead of just the selected one
 2021-04-30 12:53:38 +01:00
Šimon Brandner
5913203dc6
Merge branch 'develop' into fix-indent 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-04-29 20:08:14 +02:00