mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 04:11:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
34029 commits 219 branches 562 tags 474 MiB
Commit graph

34029 commits

This branch
This branch
All branches
Author SHA1 Message Date
Germain Souquet
27d255f30e Reduce audio waveform layout trashing 2021-06-22 12:27:54 +01:00
Germain
f56216eec5
Merge pull request #6238 from matrix-org/gsouquet/fix-17716 
Fix modal opening race condition
 2021-06-22 10:28:30 +01:00
Germain
9dee75a7b1
Merge pull request #6229 from matrix-org/gsouquet/fix-17678 2021-06-22 10:27:50 +01:00
Germain Souquet
db9ffe9b3e Fix AccessibleButton label for VerificationRequest 2021-06-22 10:18:09 +01:00
Germain
e9d87478e2
Spaces before/after curlies 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2021-06-22 10:06:31 +01:00
Germain Souquet
3c72569270 Fix modal opening race condition 
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

React 17 is hitting a race condition when a modal is closing and is trying to open another one within the same tick.
A proper long term fix would be using React.createPortal to avoid manually mounting and unmounting new React roots
 2021-06-22 09:53:58 +01:00
Travis Ralston
9fa7ac21bd
Merge pull request #6216 from SimonBrandner/feature/pr-template 
Add PR template
 2021-06-21 14:05:58 -06:00
Michael Telatynski
0e4bac46f8
Merge pull request #6222 from SimonBrandner/fix/prioritise-canonical/17570 2021-06-21 20:57:24 +01:00
Michael Telatynski
6b16b9aca6
Merge pull request #6232 from SimonBrandner/fix/quote/17715 
Fix quote button
 2021-06-21 20:29:54 +01:00
Šimon Brandner
903f898bee
Remove ComposerInsertPayload as this is a JS file 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-21 18:28:30 +02:00
RiotRobot
54c3832b5b Resetting package fields for development 2021-06-21 16:54:41 +01:00
RiotRobot
d219c92758 Merge branch 'master' into develop 2021-06-21 16:54:40 +01:00
RiotRobot
d89710defe v3.24.0 2021-06-21 16:53:20 +01:00
RiotRobot
ddbf0fa77f Prepare changelog for v3.24.0 2021-06-21 16:46:20 +01:00
RiotRobot
174a43f1ef Upgrade matrix-js-sdk to 12.0.0 2021-06-21 16:37:49 +01:00
Germain
439e5628f5
Merge pull request #6224 from matrix-org/gsouquet/fix-17707 2021-06-21 16:28:01 +01:00
Germain Souquet
ca5f8f97bb Branch matching support for forked repository on GitHub actions 2021-06-21 16:18:13 +01:00
Germain Souquet
88d25ad6af Fix typo in default import name 2021-06-21 15:44:09 +01:00
Germain Souquet
adb42b7927 Deprecate FormButton to use AccessibleButton everywhere 2021-06-21 14:16:37 +01:00
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
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
Travis Ralston
273fb75fc9 Merge branch 'develop' into travis/event-fixes 2021-06-18 11:26:51 -06: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
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
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
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