Upgrade/element web v1.11.25 #490

odelcroi · 2023-03-22T13:11:30Z

fixes #443

Included PR :

Signed-off-by: Johannes Marbach <johannesm@element.io>

Add prettier formatting to .git-blame-ignore-revs

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

This reverts commit 07bd0f1.

Revert "Update dependency worker-loader to v3 (#24033)"

Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2. - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](json5/json5@v1.0.1...v1.0.2) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…-fix Explicitly set worker-loader's publicPath to webapp

This reverts commit f5fea0b.

…-path Revert "Explicitly set worker-loader's publicPath to webapp"

This reverts commit 211de2b.

…worker-loader-to-v3 Upgrade worker loader to v3 (with config fix to prevent bundling)

This should fix any future problems along the lines of matrix-org/matrix-js-sdk#3022.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Added translation using Weblate (Breton) * Translated using Weblate (Thai) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/th/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (30 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/eo/ * Translated using Weblate (Breton) Currently translated at 3.3% (1 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/br/ * Translated using Weblate (Armenian) Currently translated at 63.3% (19 of 30 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/hy/ Co-authored-by: jmguyader <jeanmarie.guyader@gmail.com> Co-authored-by: pk'Mysickz <kokoloman001@gmail.com> Co-authored-by: Christian Paul <info@jaller.de> Co-authored-by: Aramayis Hovhannisyan <aramayis.hovhannisyan@gmail.com> Co-authored-by: Weblate <translate@riot.im>

* Resolve conflit between Tchap and Element Web 1.11.25 * Add patch-package to package.json * Move patches temporary to other path * Remove unnecessary patch * Fix patch-package position in package.json * Move back patches-unfixed to patches * Add merge script * Adaptation of 15 patches * Update merge Script * Adapt Hide Location patch * Remove patch user-friendlier-encrypted-messages * activate-cross-signing-and-secure-storage-react - to test : checkDeviceTrust without isCrossSigningSupported * add-a-help-tab-in-menu-to-redirect-to-external-tchap-faq * remove old patch activate-cross-signing-and-secure-storage-react * patch : auto-accept-tac * update patch better-help-settings * update patch : cross signing ui * patch update : disable-access-options * update patch : forgot-password, removed one file from patch * remove old patch : hide-location-if-no-map-server * update patch : login * Adapt patch simplify-exchange-key-message * update patch : password-policy * restore Tchap configuration in package json * remove lint error * change version to 4.2.0 * remove conf files from eslint * reactivate patches in package --------- Co-authored-by: olivier <odelcroi@gmail.com>

* Remove threads buttons * Add patch name to deactivate threads in patches.json and hide a new occurrence of thread in MessageActionBar * Test: fix bug-web file * Fix enhancement.yml indent --------- Co-authored-by: Audrey Lambert <audrey.lambert.42@gmail.com>

* add DecryptionFailureBar to patch cross-signing-ui * update messages

gitguardian · 2023-03-22T13:11:51Z

⚠️ GitGuardian has uncovered 4 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request

GitGuardian id	Secret	Commit	Filename
4304253	Generic High Entropy Secret	`c614c5b`	element.io/app/config.json	View secret
4304253	Generic High Entropy Secret	`0ab29bd`	element.io/app/config.json	View secret
4304253	Generic High Entropy Secret	`570aba5`	element.io/app/config.json	View secret
4304253	Generic High Entropy Secret	`6c45bf6`	element.io/app/config.json	View secret

🛠 Guidelines to remediate hardcoded secrets

Revoke and rotate the secret.
If possible, rewrite git history with git commit --amend and git push --force.

^{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!}

odelcroi · 2023-03-22T15:07:42Z

code_style.md

-4. A file has a single empty line at the end.
-5. Lines are trimmed of all excess whitespace, including blank lines.
-6. Long lines are broken up for readability.
+1. Files must be formatted with Prettier.


this is a new requirement in our project

…ent-web-v1.11.25

Johennes and others added 30 commits August 4, 2022 15:36

Move pin drop out of labs (PSG-664)

db3d10f

Signed-off-by: Johannes Marbach <johannesm@element.io>

Add prettier formatting to .git-blame-ignore-revs

7122a33

Merge pull request #23987 from vector-im/weeman1337/prettier-ref-ignore

c4806b9

Add prettier formatting to .git-blame-ignore-revs

Update typescript-eslint monorepo to v5.46.0 (#23990)

60d805e

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @types/jest to v29.2.4 (#23989)

7f06790

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @types/node to v16.18.8 (#23994)

a7124c9

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Merge branch 'master' into develop

212bbf1

Reset matrix-js-sdk back to develop branch

1f3516a

Reset matrix-react-sdk back to develop branch

85e2f06

Align code_style.md with prettier (#24124)

9a55019

Use Identity Server v2 API for tests (#24086)

805c90a

Update dependency worker-loader to v3 (#24033)

07bd0f1

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency style-loader to v3 (#24027)

3c3230d

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency optimize-css-assets-webpack-plugin to v6 (#24010)

50b17aa

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Downgrade to style-loader 2 to regain Webpack 4 compatibility (#24150)

63cb001

Revert "Update dependency worker-loader to v3 (#24033)"

211de2b

This reverts commit 07bd0f1.

Merge pull request #24152 from vector-im/gsouquet/worker-loader

f8a847d

Revert "Update dependency worker-loader to v3 (#24033)"

Explicitly set worker-loader's publicPath to webapp

f5fea0b

Merge pull request #24154 from andybalaam/andybalaam/worker-loader-v3…

c39bbb5

…-fix Explicitly set worker-loader's publicPath to webapp

Revert "Explicitly set worker-loader's publicPath to webapp"

9aa2398

This reverts commit f5fea0b.

Merge pull request #24156 from andybalaam/andybalaam/fix-wrong-worker…

411b40a

…-path Revert "Explicitly set worker-loader's publicPath to webapp"

Re-update dependency worker-loader to v3 (#24033)

d684f7f

This reverts commit 211de2b.

Specify the filename for worker-loader to avoid bundling workers

8d42155

Merge pull request #24159 from andybalaam/andybalaam/allow-upgrading-…

6ff0524

…worker-loader-to-v3 Upgrade worker loader to v3 (with config fix to prevent bundling)

Configure babel to transform logical assignment (#24160)

5b730f4

This should fix any future problems along the lines of matrix-org/matrix-js-sdk#3022.

Bump decode-uri-component from 0.2.0 to 0.2.2 (#23895)

68a3bdc

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Upgrade matrix-js-sdk to 23.1.0-rc.1

02d0c09

Upgrade matrix-react-sdk to 3.64.0-rc.1

9f76afa

RiotRobot and others added 17 commits March 7, 2023 11:46

Upgrade matrix-react-sdk to 3.68.0-rc.1

af7cfe7

Prepare changelog for v1.11.25-rc.1

8e317bd

v1.11.25-rc.1

f8a844f

Upgrade matrix-react-sdk to 3.68.0-rc.2

c2d21d0

Prepare changelog for v1.11.25-rc.2

691f4aa

v1.11.25-rc.2

9bca517

Upgrade matrix-react-sdk to 3.68.0-rc.3

11babee

Prepare changelog for v1.11.25-rc.3

43e5162

v1.11.25-rc.3

4fed510

Upgrade matrix-js-sdk to 23.5.0

22a1fee

Upgrade matrix-react-sdk to 3.68.0

db501e8

Prepare changelog for v1.11.25

1046920

v1.11.25

e300d45

Merge with conflict

6c45bf6

replace reinitialization button in unlock error message (#488)

c8ef0b8

* add DecryptionFailureBar to patch cross-signing-ui * update messages

odelcroi requested review from aulamber and jdauphant March 22, 2023 13:12

revert lint config

8ee3f70

odelcroi commented Mar 22, 2023

View reviewed changes

odelcroi added 5 commits March 22, 2023 16:13

move not used yaml

aa7a9cd

revert indentation + missing props

ea9893b

Merge remote-tracking branch 'origin/develop_tchap' into upgrade/elem…

6d16b2b

…ent-web-v1.11.25

revert parseerOptions project

e8f8a01

remove unused languages

a57fcd2

aulamber approved these changes Mar 23, 2023

View reviewed changes

odelcroi merged commit 6100518 into develop_tchap Mar 23, 2023

estellecomment added the upgrade label Nov 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade/element web v1.11.25 #490

Upgrade/element web v1.11.25 #490

odelcroi commented Mar 22, 2023 •

edited

Loading

gitguardian bot commented Mar 22, 2023 •

edited

Loading

odelcroi Mar 22, 2023

Upgrade/element web v1.11.25 #490

Upgrade/element web v1.11.25 #490

Conversation

odelcroi commented Mar 22, 2023 • edited Loading

gitguardian bot commented Mar 22, 2023 • edited Loading

⚠️ GitGuardian has uncovered 4 secrets following the scan of your pull request.

odelcroi Mar 22, 2023

Choose a reason for hiding this comment

odelcroi commented Mar 22, 2023 •

edited

Loading

gitguardian bot commented Mar 22, 2023 •

edited

Loading