OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
34,499 Commits
218 Branches
563 Tags
448 MiB
Commit Graph

34499 Commits (b40027a19303886b533182ebc53214375c706882)

Author SHA1 Message Date
Michael Telatynski 958d4df957 Naive attempt at improving our end-to-end tests in Github Actions 2021-06-18 18:32:45 +01:00
Travis Ralston 273fb75fc9 Merge branch 'develop' into travis/event-fixes 2021-06-18 11:26:51 -06:00
Michael Telatynski 8a3dc1bbdf fix tests 2021-06-18 17:56:18 +01:00
David Teller 77a4d345bd
Submitting abuse reports to moderators (#6213) 
This patch is part of MSC3215. It implements `feature_report_to_moderator`
    to let end-users send report to room moderators instead of homeserver
    administrators.

    This only works if the room has been setup for moderation, something that
    does not have a UX yet.

    Signed-off-by: David Teller <davidt@element.io>
 2021-06-18 18:09:02 +02:00
Šimon Brandner f193f8a211
Merge remote-tracking branch 'upstream/develop' into feature/pr-template 2021-06-18 17:35:22 +02:00
Šimon Brandner 335b105506
Add PR template 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-18 17:29:12 +02:00
Michael Telatynski ab94b284b8 Updates around the use of private fields out of class 2021-06-18 16:29:10 +01:00
Travis Ralston bc74a7366b
Merge pull request #6197 from matrix-org/travis/voice-messages/fix-msc-number 
Update MSC number references for voice messages
 2021-06-18 09:23:28 -06:00
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 3b7c92fd9e Use new js-sdk types properly 2021-06-18 16:18:42 +01:00
Michael Telatynski 058cbbbd0c Fix imports 2021-06-18 16:13:55 +01:00
Michael Telatynski 9cce5ef10f Consolidate types with js-sdk changes 2021-06-18 15:31:12 +01:00
J. Ryan Stinnett f34086aa3c
Merge pull request #6214 from matrix-org/jryans/enc-phase-ts 
Fix phase enum usage in JS modules as well
 2021-06-18 14:13:31 +01:00
J. Ryan Stinnett 538165d515 Fix phase enum usage in JS modules as well 
https://github.com/matrix-org/matrix-react-sdk/pull/6185 converted
`SetupEncryptionStore` to TS, including moving the phase states to an enum. The
calling JS modules were forgotten, so they got a bit confused.

Fixes https://github.com/vector-im/element-web/issues/17689
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6185
 2021-06-18 14:05:12 +01:00
Germain 2fd919e5c7
Merge pull request #6185 from matrix-org/gsouquet/dialogs-ts-migration 2021-06-18 12:56:39 +01:00
Germain Souquet fcda0604e0 Fix RoomMember import 2021-06-18 12:48:31 +01:00
Germain Souquet d22617c422 More specific type definition and adhering to code style better 2021-06-18 12:44:15 +01:00
Germain Souquet 3f1ca970d6 Merge branch 'develop' into gsouquet/dialogs-ts-migration 2021-06-18 12:27:00 +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
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
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
Michael Telatynski 017e0ba40f fix more private field accesses in tests 2021-06-17 15:23:29 +01:00
Michael Telatynski 2e73647a85 Fix tests by updating private field names and spies 2021-06-17 15:18:52 +01:00
J. Ryan Stinnett 07a0c3e450
Merge pull request #6211 from matrix-org/jryans/reply-scroll-release 
[Release] Keep composer reply when scrolling away from a highlighted event
 2021-06-17 15:12:54 +01:00
Germain Souquet 1597b2a971 Keep composer reply when scrolling away from a highlighted event 2021-06-17 15:07:59 +01:00
J. Ryan Stinnett e69b2fb3be
Merge pull request #6210 from matrix-org/jryans/reply-preview-li-release 
[Release] Remove stray bullet point in reply preview
 2021-06-17 15:04:44 +01:00
J. Ryan Stinnett 1fcfec6a94
Merge pull request #6209 from matrix-org/jryans/nested-reply-perf-release 
[Release] Stop requesting null next replies from the server
 2021-06-17 15:04:36 +01:00
Germain Souquet 0367b5bcce remove stray bullet point in reply preview 2021-06-17 15:02:18 +01:00
J. Ryan Stinnett 7c6161d83a 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-17 15:00:13 +01:00
Michael Telatynski 3e38d92fa4 Fix up some more type defs 2021-06-17 14:49:27 +01:00
J. Ryan Stinnett 9f83846ecc Remove redundant word from GitHub Actions workflow 2021-06-17 14:35:33 +01:00
Michael Telatynski 02e72d8b04 Fix more type definitions 2021-06-17 14:24:53 +01:00
Michael Telatynski f929d2ee5f Typescript fixes due to MatrixEvent being TSified 2021-06-17 14:06:03 +01:00
Michael Telatynski 97e6599780
Merge pull request #6207 from matrix-org/t3chguy/ts/5 
Fix types in SlashCommands
 2021-06-17 12:15:16 +01:00
Michael Telatynski cce4ccb157 Fix types in SlashCommands which assumed something was a promise but it wasn't 2021-06-17 11:37:06 +01:00
Germain 782adbc41e
Merge pull request #6190 from matrix-org/gsouquet/performance-tracking-markers 2021-06-17 10:27:33 +01:00
Germain 48e090abcc
Remove unnecessary comment 2021-06-17 10:20:43 +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 2f1abe251f
Merge pull request #6206 from matrix-org/gsouquet/fix-17672 
Remove stray bullet point in reply preview
 2021-06-17 08:58:47 +01:00
Germain Souquet 1a08af8ccf remove stray bullet point in reply preview 2021-06-17 08:45:09 +01: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