Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade/element web v1.11.46 #846

Merged
merged 92 commits into from
Jan 26, 2024
Merged

Upgrade/element web v1.11.46 #846

merged 92 commits into from
Jan 26, 2024

Conversation

estellecomment
Copy link
Contributor

@estellecomment estellecomment commented Nov 29, 2023 •
edited
Loading

Fix #801

Includes some fixes to the i18n scripts, and migrating tchap translations to follow the translation migration done in element.

  • merge code
  • patch-make is broken : Could not parse yarn v1 lock file -> the lock file had conflicts (>>>> etc in the file)
  • migrate patches
    • unchanged patches
    • hand-merged patches
      • activate-cross-signing-and-secure-storage-react/
        • code
        • hand testing
      • better-text-for-locked-messages/
        • fixed but cannot patch : fix patch-make or use Julien's script
        • can we use new-style keys too, does that work ?
        • cypress test passes
      • better-text-for-tab-switch/
        • code
        • hand testing
      • change-sections-order-in-security-privacy-settings/
        • code
        • hand testing
      • cross-signing-ui/
        • code
        • hand testing
      • customize-room-header-bar
        • code
        • hand testing
      • disable-access-options/
      • error-tchap-is-down/
      • forgot-password/
      • hide-room-alias-settings/
      • login/
      • registration-for-mainlining/
      • show-icon-on-public-room/
      • simplify-exchange-key-message/
  • run yarn i18n-tchap to check for broken translations (PR is not merged yet)
  • fix automated tests
    • unit
    • cypress
  • run code and test manually

germain-gg and others added 30 commits September 20, 2023 08:21
@germain-gg
Document feature_notifications_panel labs flag (#25924)
dcc0f9f
@renovate
Update docker (#26204)
eb40bc9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update SimenB/github-actions-cpu-cores action to v2 (#26203)
8a927e5 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update babel monorepo to v7.22.20 (#26199)
c59d0a9 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update jest to v29.5.5 (#26200)
4367299 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@t3chguy
Update tsconfig.json
21f915f
@t3chguy
Make tests happier
7fe11a6 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
@t3chguy
Merge remote-tracking branch 'origin/develop' into develop
29d5309
@RiotRobot
Merge branch 'master' into develop
8492c22
@RiotRobot
Reset matrix-js-sdk back to develop branch
b4cc35b
@RiotRobot
Reset matrix-react-sdk back to develop branch
1707ecd
@MidhunSureshR
Fix broken tsc from localazy changes (#26255)
47677c8
@RiotRobot
Upgrade matrix-react-sdk to 3.81.1
c47c598
@RiotRobot
Prepare changelog for v1.11.45
e4ecf42
@RiotRobot
v1.11.45
ae98e3a
@RiotRobot
Merge branch 'master' into develop
b7cca93
@RiotRobot
Reset matrix-js-sdk back to develop branch
6c30512
@RiotRobot
Reset matrix-react-sdk back to develop branch
260e0fc
@RiotRobot
Upgrade matrix-js-sdk to 29.0.0-rc.1
fcb961d
@RiotRobot
Upgrade matrix-react-sdk to 3.82.0-rc.1
3b47b1b
@RiotRobot
Prepare changelog for v1.11.46-rc.1
5aa6d0b
@RiotRobot
v1.11.46-rc.1
796e60c
@andybalaam
Bump matrix-web-i18n to 3.1.3 for KEY_SEPARATOR (#26287)
24da657
@RiotRobot
Prepare changelog for v1.11.46-rc.2
5c36d20
@RiotRobot
v1.11.46-rc.2
b45e72c
@RiotRobot
Upgrade matrix-js-sdk to 29.0.0
20ad519
@RiotRobot
Upgrade matrix-react-sdk to 3.82.0
27733c3
@RiotRobot
Prepare changelog for v1.11.46
3abaee0
@RiotRobot
v1.11.46
d072737
@estellecomment
Merge tag 'v1.11.46' into upgrade/element-web-v1.11.46 (patches not f…
c04e25a 
…ixed yet)

* Use .well-known to discover a default rendezvous server for use with Sign in with QR ([\#11655](matrix-org/matrix-react-sdk#11655)). Contributed by @hughns.
* Message layout will update according to the selected style  ([\#10170](matrix-org/matrix-react-sdk#10170)). Fixes #21782. Contributed by @manancodes.
* Implement MSC4039: Add an MSC for a new Widget API action to upload files into the media repository ([\#11311](matrix-org/matrix-react-sdk#11311)). Contributed by @dhenneke.
* Render space pills with square corners to match new avatar ([\#11632](matrix-org/matrix-react-sdk#11632)). Fixes #26056.
* Linkify room topic ([\#11631](matrix-org/matrix-react-sdk#11631)). Fixes #26185.
* Show knock rooms in the list ([\#11573](matrix-org/matrix-react-sdk#11573)). Contributed by @maheichyk.
* Bump matrix-web-i18n dependency to 3.1.3 ([\#26287](element-hq/element-web#26287))
* Fix: Avatar shrinks with long names ([\#11698](matrix-org/matrix-react-sdk#11698)). Fixes #26252. Contributed by @manancodes.
* Update custom translations to support nested fields in structured JSON ([\#11685](matrix-org/matrix-react-sdk#11685)).
* Fix: Edited message remove button is hard to reach. ([\#11674](matrix-org/matrix-react-sdk#11674)). Fixes #24917. Contributed by @manancodes.
* Fix: Theme selector radio button not aligned in center with the text ([\#11676](matrix-org/matrix-react-sdk#11676)). Fixes #25460. Contributed by @manancodes.
* Fix: Unread notification dot aligned ([\#11658](matrix-org/matrix-react-sdk#11658)). Fixes #25285. Contributed by @manancodes.
* Fix: sync intentional mentions push rules with legacy rules ([\#11667](matrix-org/matrix-react-sdk#11667)). Fixes #26227. Contributed by @kerryarchibald.
* Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](matrix-org/matrix-react-sdk#11634)). Fixes #26209.
* Fix: Alignment Fixed ([\#11648](matrix-org/matrix-react-sdk#11648)). Fixes #26169. Contributed by @manancodes.
* Fix: onFinished added which closes the menu ([\#11647](matrix-org/matrix-react-sdk#11647)). Fixes #25556. Contributed by @manancodes.
* Don't start key backups when opening settings ([\#11640](matrix-org/matrix-react-sdk#11640)).
* Fix add to space avatar text centering ([\#11643](matrix-org/matrix-react-sdk#11643)). Fixes #26154.
* fix avatar styling in lightbox ([\#11641](matrix-org/matrix-react-sdk#11641)). Fixes #26196.
@estellecomment
Merge branch 'develop_tchap' into upgrade/element-web-v1.11.46
3bdbca1
@estellecomment
Upgrade patch display-call-button-anyway
059ba06
@estellecomment
Rename string to unable_to_decrypt_with_info_message
5d25efe
@estellecomment
Migrate translations from old keys to new. (More coming)
d9368ca
@estellecomment
Fix strings in two tchap components
cb7a951
@estellecomment
More fixed translations
6ed7343
@estellecomment
More translations
9a8d397
@estellecomment
More translation migrations
2733e10
@estellecomment
Migrate more strings
7c3ddba
@estellecomment
Format translation file
a219aad
@estellecomment
Segment keys in translation file
a103463
@estellecomment
Clean up translation file
43bb108
@estellecomment
Clean up translation file
5da3627
@estellecomment
Fix broken strings with missing html tags
07931a0
@estellecomment
Remove a custom key and reuse the element one
4ef5582
@estellecomment
More translation fixes and a patch simplification
efb39c5
@estellecomment
More translation fixes
d3a1742
@estellecomment
Fixes to TchapExportE2eKeysDialog.tsx, use new keys
93d5e77
@estellecomment
Remove old-style duplicate keys in removed_translations
b246aa7
@estellecomment
Reformat translations file to aa|bb|cc format instead of nesting
42601d6
@estellecomment
Scripts to change from piped to nested format and back
6d3ecef
@estellecomment
Add the format change step in script
dd1a8a3
@estellecomment
Add the format change in script, for real this time
b732abd
@estellecomment
Fix patch, one modif had been lost
8599750
@estellecomment estellecomment mentioned this pull request Jan 26, 2024
Closed
@odelcroi odelcroi closed this Jan 26, 2024
@odelcroi odelcroi reopened this Jan 26, 2024
@odelcroi odelcroi self-requested a review January 26, 2024 13:43
odelcroi
odelcroi approved these changes Jan 26, 2024
View reviewed changes
Copy link
Member

@odelcroi odelcroi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minimal tests acceptance : OK

@estellecomment estellecomment merged commit 4770643 into develop_tchap Jan 26, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@odelcroi odelcroi odelcroi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Upgrade to Element-web 1.11.46 will change all translation strings
7 participants
@estellecomment @odelcroi @germain-gg @t3chguy @RiotRobot @MidhunSureshR @andybalaam