enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity
42,834 Commits 1 Branch 7 Tags
7a80ea4bbe95adec14abc79a5bb8206cda170e61
Commit Graph

12860 Commits

Author SHA1 Message Date
Germain Souquet 3f1ca970d6 Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-18 12:27:00 +01:00
Michael Telatynski 566b8af2a4 Initial support for MSC3083 via MSC3244 2021-06-18 12:18:23 +01:00
Michael Telatynski e508ff003b Clean up typing to Security Room Settings 2021-06-18 11:48:08 +01:00
Michael Telatynski 18cafeb221 Add ability to disable entire StyledRadioGroup 2021-06-18 11:40:02 +01:00
Michael Telatynski 56fe7f8763 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 2021-06-18 10:05:58 +01:00
Michael Telatynski bf66a72054 Move JoinRule, GuestAccess, HistoryVisibility enums into the js-sdk 2021-06-18 10:05:46 +01:00
Michael Telatynski dddc32d870 Merge pull request #6208 from matrix-org/t3chguy/ts/5 2021-06-18 09:49:03 +01:00
Michael Telatynski d9caa3533b Merge pull request #5858 from matrix-org/t3chguy/fix/12740 2021-06-18 08:22:21 +01:00
Travis Ralston 98e0200b4a Function name 2021-06-17 14:21:50 -06:00
Travis Ralston a687391b98 Switch order 2021-06-17 14:21:01 -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
Šimon Brandner 512c054656 Add call type icon 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 17:55:18 +02:00
Germain 71ff5248fe Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591 2021-06-17 16:41:00 +01:00
Michael Telatynski 7d90612371 Iterate PR 2021-06-17 16:22:40 +01:00
Michael Telatynski 35e68b8aa5 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 2021-06-17 15:45:32 +01:00
Šimon Brandner 7b6c3aec63 Change some styling to better match the designs 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 16:33:00 +02:00
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
Šimon Brandner ab3ccecc96 Use UIStore 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-17 15:52:55 +02:00
Michael Telatynski 3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
Šimon Brandner d89392a1d9 Merge remote-tracking branch 'upstream/develop' into fix/17130/draggable-pip 2021-06-17 15:41:19 +02:00
Michael Telatynski 02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Germain Souquet ae5cd9d7ac Add new layout switcher UI 
Co-authored-by: Quirin Götz <codeworks@supercable.onl>
 2021-06-17 14:11:44 +01:00
Michael Telatynski f929d2ee5f Typescript fixes due to MatrixEvent being TSified 2021-06-17 14:06:03 +01:00
J. Ryan Stinnett 6e827ad4c9 Merge pull request #6204 from robintown/forward-dialog-display-name 
Fix forward dialog message preview display names
 2021-06-17 10:10:54 +01:00
Germain Souquet 1a08af8ccf remove stray bullet point in reply preview 2021-06-17 08:45:09 +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
Robin Townsend 2750d64495 Merge branch 'develop' into event-tile-preview-fixes 2021-06-16 18:27:10 -04:00
Robin Townsend 79bf7bee56 Fix EventTilePreview display names 
Because of 91df392a2a, we now need to
additionally set rawDisplayName to properly fake our display name for an
event.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-16 18:23:44 -04:00
Robin Townsend ce57b66c91 Fix forward dialog message preview display names 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-16 18:17:25 -04:00
J. Ryan Stinnett 8f02ca8ce9 Stop requesting null next replies from the server 
A recent change (47e007e08f) introduced a
regression where we failed to check whether a reply thread has a next reply.
This meant that we would end up sending `/context/undefined` requests to the
server for every reply thread on every room view.

Fixes https://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
 2021-06-16 18:04:41 +01:00
Šimon Brandner dbdb61c820 Improve the mxid overlap situation 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-16 17:21:29 +02:00
Michael Telatynski ccf30ed94c Merge pull request #6202 from matrix-org/t3chguy/fix/17669 2021-06-16 12:46:44 +01: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
Michael Telatynski 590ce56740 Use MultiInviter error messages in InviteDialog for room invites 2021-06-16 11:48:14 +01:00
Michael Telatynski 47ddd33d21 Remove explicit .js imports 2021-06-16 10:24:51 +01:00
Germain Souquet 069e2e13cf Migrate MessageTimestamp to TypeScript 2021-06-16 10:01:30 +01:00
Michael Telatynski d4e376201f Break down the SpacePanel component 2021-06-16 09:44:37 +01:00
Michael Telatynski cee294f5a7 iterate PR 2021-06-16 09:23:06 +01:00
Michael Telatynski b4fbc791bb Add experimental options to the Spaces beta 2021-06-16 09:01:13 +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
Michael Telatynski 660a849cdd Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into travis/blurhash 
 Conflicts:
	package.json
	src/ContentMessages.tsx
	yarn.lock
 2021-06-15 12:58:29 +01:00