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

4769 commits

Author SHA1 Message Date
Michael Telatynski
233e2aa425 Fix bugs identified by the typescripting 2021-06-18 16:22:31 +01:00
Michael Telatynski
0ae4e7b11d Fix typescript types 2021-06-18 16:21:46 +01:00
Michael Telatynski
058cbbbd0c Fix imports 2021-06-18 16:13:55 +01:00
Šimon Brandner
f96c366aa4
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:07:43 +02:00
Robin Townsend
d08f8087c6
Merge branch 'matrix-org:develop' into text-for-event-perf 2021-06-18 10:29:41 -04:00
Michael Telatynski
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5 2021-06-18 09:49:03 +01:00
Travis Ralston
98e0200b4a Function name 2021-06-17 14:21:50 -06:00
Ayush Pratap Singh
1259247380
Merge branch 'matrix-org:develop' into Bubble-bericht 2021-06-18 00:16:16 +05:30
Ayush PS
1394e5b0a4 Updated changes for the tile 
Signed-off-by: Ayush PS <ayushpratap16@gmail.com>
 2021-06-18 00:12:39 +05:30
Michael Telatynski
f38cd38bd3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740 
 Conflicts:
	src/components/structures/TimelinePanel.js
	src/components/views/context_menus/MessageContextMenu.js
	src/components/views/right_panel/UserInfo.tsx
	src/dispatcher/actions.ts
 2021-06-17 15:31:06 +01:00
Šimon Brandner
949532c297
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile 2021-06-17 15:53:25 +02:00
Michael Telatynski
02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Jaiwanth
9e6b8ff9f5 Start implementation of plain text export 2021-06-17 10:46:08 +05:30
Robin Townsend
af11878e0c Use cached setting values when calling TextForEvent 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-16 20:41:36 -04:00
Michael Telatynski
626d575820 tidy AuxPanel TS 2021-06-16 12:07:58 +01:00
Michael Telatynski
d87325ae6a Small cleanup around the room status bar and auxpanel to prevent redundant state updates 2021-06-16 12:06:41 +01:00
Michael Telatynski
deb2e8d679 Remove unused methods 2021-06-16 12:04:01 +01:00
Jaiwanth
cff4521106 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-16 10:52:00 +05:30
Travis Ralston
d13611736a Update MSC number references for voice messages 
as per https://github.com/matrix-org/matrix-doc/pull/3245
 2021-06-15 17:24:56 -06:00
Travis Ralston
ea46df0d48 Partially restore immutable event objects at the rendering layer 
This is primarily to fix some extremely rare edge cases in local echo, but also restores the accuracy of some comments in the stack regarding immutable event objects (which were made mutable many years ago).

This shouldn't have any impact on the daily usage of the app, only adding a measured 0ms of latency to the stack.
 2021-06-15 14:23:19 -06:00
Tulir Asokan
9f66bd0f65 Remove extra space 2021-06-15 17:48:16 +03:00
Tulir Asokan
cdd2773aa6 Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-15 17:37:49 +03:00
Jaiwanth
bd75849e73 Enable option to set maximum file size 2021-06-15 16:41:31 +05:30
Jaiwanth
ab653d9952 Handle requests with no attachments 2021-06-14 11:08:17 +05:30
Šimon Brandner
e5188a5258
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-06-12 13:32:49 +02:00
Germain Souquet
b1824ce579 fix HTML tag for Event Tile when not rendered in a list 2021-06-11 11:34:53 +01:00
Jaiwanth
a1b614f2b3 Implement exporting from a specific start date and fix few bugs 2021-06-11 12:04:05 +05:30
Germain
88e337b89c
Merge pull request #5929 from matrix-org/gsouquet-e2ee-warning 2021-06-10 14:58:31 +01:00
Germain
79b8fbc2a9
Add indentation for unencrypted warning text 
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
 2021-06-10 14:21:48 +01:00
Germain
0a6cd6a758
Merge pull request #6171 from matrix-org/gsouquet/fix-17505 
Fix expanding last collapsed sticky session when zoomed in
 2021-06-10 12:44:57 +01:00
Germain Souquet
9731e275f8 cater for an undefined MatrixClient on rooms 2021-06-10 12:15:55 +01:00
Germain Souquet
6606a1142d Update unencrypted room warning copy 2021-06-10 11:29:10 +01:00
Germain Souquet
7f3173f170 Implement unencrypted warning slate in rooms 2021-06-10 11:14:43 +01:00
Germain Souquet
c2d1eb3e8e Merge branch 'develop' into gsouquet-e2ee-warning 2021-06-10 10:25:20 +01:00
Šimon Brandner
fdda534053
Merge branch 'develop' into feature/call-event-tile 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-09 19:23:14 +02:00
Germain Souquet
b4cb275ca1 Fix expanding last collapsed sticky session when zoomed in 2021-06-09 17:59:41 +01:00
Germain
91a88f25a8
Merge pull request #6168 from matrix-org/gsouquet/fix-17586 
Revert refreshStickyHeaders optimisations
 2021-06-09 16:34:11 +01:00
J. Ryan Stinnett
c6972c4535 Fix spelling 2021-06-09 15:53:38 +01:00
J. Ryan Stinnett
e566704bdf Remove redundant early return 2021-06-09 15:48:30 +01:00
J. Ryan Stinnett
b43315c6c1 Restore read receipt animation from event to event 
This restores expected read receipt animation by always including the positioned
parent of read receipts. I imagine there's something smarter we could be doing,
but for now, at least least get back to expected behaviour.

Fixes https://github.com/vector-im/element-web/issues/17561
 2021-06-09 15:46:10 +01:00
Germain Souquet
927de02a8e Revert refreshStickyHeaders optimisations 2021-06-09 14:59:55 +01:00
Jaiwanth
6160b11eb8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations 2021-06-09 16:46:28 +05:30
Jaiwanth
573ababb8c Get rid of mediaSrc and avatarSrc props 2021-06-09 15:23:47 +05:30
Germain
8334a2ba60
Merge pull request #6143 from robintown/hide-events-perf 2021-06-09 09:13:56 +01:00
Jaiwanth
dbb3614374
Merge branch 'develop' into export-conversations 2021-06-08 18:43:03 +05:30
Jaiwanth
6f8c1638aa isExporting -> forExport and wrap EventTile with Context Provider 2021-06-08 18:35:45 +05:30
Jaiwanth
9e298e9f45 Add logs and unload listener 2021-06-08 12:36:28 +05:30
Robin Townsend
b97867271b Merge branch 'develop' into improved-forwarding-ui 2021-06-07 19:09:36 -04:00
Michael Telatynski
ced6c43147
Merge pull request #6152 from matrix-org/t3chguy/fix/17571 
Fix Stickerpicker context menu
 2021-06-07 22:21:19 +01:00
Tulir Asokan
059241b5cc Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering 2021-06-07 19:26:12 +03:00