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

Rebase against Element Android v1.6.14 #1025

Merged
merged 45 commits into from
Apr 10, 2024
Merged

Rebase against Element Android v1.6.14 #1025

merged 45 commits into from
Apr 10, 2024

Commits on Feb 16, 2024

  1. Merge tag 'v1.6.12' into develop 

    tag
    @bmarty
    bmarty committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    c6d718a View commit details
    Browse the repository at this point in the history

  2. version++

    @bmarty
    bmarty committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    8682a75 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Update release note with CVE and GHSA identifiers

    @bmarty
    bmarty committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    1dd73ad View commit details
    Browse the repository at this point in the history

Commits on Feb 29, 2024

  1. Increase decryption failure grace period

    @BillCarsonFr
    BillCarsonFr committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    bc5c31d View commit details
    Browse the repository at this point in the history

  2. revert previous commit

    @BillCarsonFr
    BillCarsonFr committed Feb 29, 2024
    Configuration menu
    Copy the full SHA
    79462bc View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Fix send button blinking with RTE

    @ganfra
    ganfra committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    21d685f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8770 from element-hq/feature/fga/fix_send_button_… 

    …blinking

Fix send button blinking with RTE
    @ganfra
    ganfra authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    b4b11a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2024

  1. Bump io.element.android:wysiwyg from 2.29.0 to 2.30.0 

    Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.29.0 to 2.30.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.29.0...2.30.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Mar 5, 2024
    Configuration menu
    Copy the full SHA
    7e6c40b View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2024

  1. Merge pull request #8772 from element-hq/dependabot/gradle/io.element… 

    ….android-wysiwyg-2.30.0

Bump io.element.android:wysiwyg from 2.29.0 to 2.30.0
    @bmarty
    bmarty authored Mar 7, 2024
    Configuration menu
    Copy the full SHA
    737b18d View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2024

  1. Bump io.element.android:wysiwyg from 2.30.0 to 2.31.0 

    Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.30.0 to 2.31.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.30.0...2.31.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Mar 8, 2024
    Configuration menu
    Copy the full SHA
    0df8932 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge pull request #8775 from element-hq/dependabot/gradle/io.element… 

    ….android-wysiwyg-2.31.0

Bump io.element.android:wysiwyg from 2.30.0 to 2.31.0
    @jmartinesp
    jmartinesp authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    c28fe6d View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2024

  1. Fix StreamEventsManager not signaling event decryptions

    @BillCarsonFr
    BillCarsonFr committed Mar 12, 2024
    Configuration menu
    Copy the full SHA
    ee59171 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge pull request #8777 from element-hq/fix_eventstream_rust 

    Fix StreamEventsManager not signaling event decryptions
    @BillCarsonFr
    BillCarsonFr authored Mar 14, 2024
    Configuration menu
    Copy the full SHA
    4231b32 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Ignore files created by copilot

    @bmarty
    bmarty committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    c0da558 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Ensure the keys are updated as soon as possible. Else it seems that w… 

    …e had to wait for the next sync response.
    @bmarty
    bmarty committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    5cd78c0 View commit details
    Browse the repository at this point in the history

  2. BootstrapReAuthFragment: fix infinite loading wheel by submitting at … 

    …start up.
    @bmarty
    bmarty committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    1155c43 View commit details
    Browse the repository at this point in the history

  3. towncrier

    @bmarty
    bmarty committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    24c7131 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Merge pull request #8786 from element-hq/feature/bma/setupSecureBackup 

    Fix setup secure backup
    @bmarty
    bmarty authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    b23757c View commit details
    Browse the repository at this point in the history

  2. Bump io.element.android:wysiwyg from 2.31.0 to 2.34.0 

    Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.31.0 to 2.34.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.31.0...2.34.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    d299ebc View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Merge pull request #8787 from element-hq/dependabot/gradle/io.element… 

    ….android-wysiwyg-2.34.0

Bump io.element.android:wysiwyg from 2.31.0 to 2.34.0
    @ganfra
    ganfra authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    d54e605 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2024

  1. Update analytic events

    @BillCarsonFr
    BillCarsonFr committed Mar 26, 2024
    Configuration menu
    Copy the full SHA
    fda38e9 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Add missing periods.

    @bmarty
    bmarty committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    f559dcd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8789 from element-hq/feature/bca/bump_analytics_e… 

    …vent

Update analytic events
    @BillCarsonFr
    BillCarsonFr authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    def2a8a View commit details
    Browse the repository at this point in the history

  3. fix rust device to CryptoDeviceInfo mapping

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    3fa3eb1 View commit details
    Browse the repository at this point in the history

  4. refactor: StreamEventsManager report MXCryptoError instead of throwable

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    72d2199 View commit details
    Browse the repository at this point in the history

  5. Analytics tracker, support report custom properties not yet in schame

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    1f430a4 View commit details
    Browse the repository at this point in the history

  6. Refactor Decryption Failure Tracker and report new properties

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    fcc5181 View commit details
    Browse the repository at this point in the history

  7. doc update

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    28eead7 View commit details
    Browse the repository at this point in the history

  8. use the new updated analytics events

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    4d04b27 View commit details
    Browse the repository at this point in the history

  9. KDoc punctuation

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    9ebc10f View commit details
    Browse the repository at this point in the history

  10. Use new error name for expected UTD

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    393f3f3 View commit details
    Browse the repository at this point in the history

  11. add changelog

    @BillCarsonFr
    BillCarsonFr committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    0f3f2b1 View commit details
    Browse the repository at this point in the history

  12. Bump io.element.android:wysiwyg from 2.34.0 to 2.35.0 

    Bumps [io.element.android:wysiwyg](https://github.com/matrix-org/matrix-wysiwyg) from 2.34.0 to 2.35.0.
- [Changelog](https://github.com/matrix-org/matrix-rich-text-editor/blob/main/CHANGELOG.md)
- [Commits](matrix-org/matrix-rich-text-editor@2.34.0...2.35.0)

---
updated-dependencies:
- dependency-name: io.element.android:wysiwyg
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Mar 27, 2024
    Configuration menu
    Copy the full SHA
    699ccf1 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Merge pull request #8792 from element-hq/dependabot/gradle/io.element… 

    ….android-wysiwyg-2.35.0

Bump io.element.android:wysiwyg from 2.34.0 to 2.35.0
    @jmartinesp
    jmartinesp authored Apr 1, 2024
    Configuration menu
    Copy the full SHA
    237580c View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Fix: should remember already reported events

    @BillCarsonFr
    BillCarsonFr committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    2bbb49b View commit details
    Browse the repository at this point in the history

  2. Analytics | if no property use null instead of empty map

    @BillCarsonFr
    BillCarsonFr committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    752c884 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8780 from element-hq/valere/utd_posthog_more_prop… 

    …erties

UTD posthog reporting add more properties to captured event
    @BillCarsonFr
    BillCarsonFr authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    0f3ff2e View commit details
    Browse the repository at this point in the history

  4. Add action to report a user form the message detail bottom sheet. #8796

    @bmarty
    bmarty committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    99ec61e View commit details
    Browse the repository at this point in the history

  5. Add action to report a user form the user profile view. EventId is no… 

    …t relevant, but requested by the API.
    @bmarty
    bmarty committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    b14cb81 View commit details
    Browse the repository at this point in the history

  6. towncrier.

    @bmarty
    bmarty committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    5ce0801 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #8797 from element-hq/feature/bma/reportUser 

    Report user
    @bmarty
    bmarty authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9aaf29d View commit details
    Browse the repository at this point in the history

  8. Changelog for version 1.6.14

    @bmarty
    bmarty committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    ea9751e View commit details
    Browse the repository at this point in the history

  9. Adding fastlane file for version 1.6.14

    @bmarty
    bmarty committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    f7095d8 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'release/1.6.14' into main

    @bmarty
    bmarty committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    310cecf View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. Merge element-hq/element-android v1.6.14 into element-rebase

    @yostyle
    yostyle committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6a6327e View commit details
    Browse the repository at this point in the history