mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 11:47:23 +03:00
Code Issues Projects Releases Packages Wiki Activity
34089 commits 217 branches 561 tags 411 MiB
Commit graph

34089 commits

This branch
This branch
All branches
Author SHA1 Message Date
Germain Souquet
ca123d3c4d Migrate MKeyVerificationRequest to TypeScript 2021-06-21 14:05:56 +01:00
J. Ryan Stinnett
b6e0068822
Merge pull request #6225 from matrix-org/jryans/repair-decrypted-source 
Fix View Source accessing renamed private field on MatrixEvent
 2021-06-21 10:09:36 +01:00
Germain Souquet
2d9e97a3e1 Fix branch matching to work with GitHub Actions and BuildKite 2021-06-21 09:47:46 +01:00
Michael Telatynski
e79b7d7adb Fix View Source accessing renamed private field on MatrixEvent 2021-06-21 09:45:22 +01:00
Michael Telatynski
6c64f564e4 Naive attempt at improving our end-to-end tests in Github Actions 2021-06-21 09:14:44 +01:00
Michael Telatynski
b380e43e4f
Merge pull request #6219 from matrix-org/t3chguy/ts/6 
Fix ConfirmUserActionDialog returning an input field rather than text
 2021-06-21 08:53:43 +01:00
Šimon Brandner
7bf230e665
Prefer canonical aliases over non-canonical ones 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-20 11:17:42 +02:00
Šimon Brandner
d0ea842f1e
Remove sorting by index as it is already done here: e9ea3cad76/src/autocomplete/QueryMatcher.ts (L120) 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-20 10:29:08 +02:00
Travis Ralston
e9ea3cad76
Merge pull request #6221 from matrix-org/revert-6196-travis/event-fixes 
Revert "Partially restore immutable event objects at the rendering layer"
 2021-06-19 13:43:30 -06:00
Travis Ralston
9344adb2d2
Revert "Partially restore immutable event objects at the rendering layer" 2021-06-19 13:38:19 -06:00
Michael Telatynski
2c5ddea1d9 Fix ConfirmUserActionDialog returning an input field rather than text 2021-06-19 15:57:07 +01:00
Michael Telatynski
a2a5158411 Fix View Source accessing renamed private field on MatrixEvent 2021-06-19 15:37:48 +01:00
Michael Telatynski
2c66adcb0e
Merge pull request #6218 from matrix-org/t3chguy/ci-jq 
Add jq to e2e tests Dockerfile
 2021-06-18 19:27:37 +01:00
Michael Telatynski
4ff25c5978
Add jq to e2e tests Dockerfile 2021-06-18 19:16:39 +01:00
Travis Ralston
89240c377b
Merge pull request #6196 from matrix-org/travis/event-fixes 
Partially restore immutable event objects at the rendering layer
 2021-06-18 11:32:57 -06:00
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
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