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

Merge upstream v1.6.18 #305

Merged
merged 29 commits into from
Nov 1, 2024
Merged

Merge upstream v1.6.18 #305

merged 29 commits into from
Nov 1, 2024

Commits on May 21, 2024

  1. --- 

    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 May 21, 2024
    Configuration menu
    Copy the full SHA
    056eeba View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Add super properties to posthog (plateformCode)

    @BillCarsonFr
    BillCarsonFr committed May 28, 2024
    Configuration menu
    Copy the full SHA
    08c124e View commit details
    Browse the repository at this point in the history

  2. Add changelog

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

Commits on May 29, 2024

  1. Merge branch 'main' into develop

    @ganfra
    ganfra committed May 29, 2024
    Configuration menu
    Copy the full SHA
    a227245 View commit details
    Browse the repository at this point in the history

  2. version++

    @ganfra
    ganfra committed May 29, 2024
    Configuration menu
    Copy the full SHA
    72575a2 View commit details
    Browse the repository at this point in the history

  3. Remove unused context in crypto service getCryptoVersion

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

  4. Update to analytics events 0.23.0 and refactor

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

  5. improve tests

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

Commits on May 30, 2024

  1. Move getCryptoVersion from CryptoService to Matrix companion, it does… 

    … not need a session to get the value.

This simplify a lot accessing this data.
    @bmarty
    bmarty committed May 30, 2024
    Configuration menu
    Copy the full SHA
    7e41d73 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Merge pull request element-hq#8839 from element-hq/feature/bca/add_pl… 

    …atformcode_to_posthog

Support reporting super properties to posthog (appPlatform)
    @BillCarsonFr
    BillCarsonFr authored May 31, 2024
    Configuration menu
    Copy the full SHA
    47bb23a View commit details
    Browse the repository at this point in the history

  2. Fix redacted events not grouped correctly when hidden events are inse… 

    …rted between element-hq#8840
    @ganfra
    ganfra committed May 31, 2024
    Configuration menu
    Copy the full SHA
    2158aa0 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Merge pull request element-hq#8841 from element-hq/feature/fga/fix_re… 

    …dacted_collapse

Fix redacted events not grouped correctly
    @ganfra
    ganfra authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    15a252b View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Fix sonarqube UnsupportedClassVersionError 

    revert sonarqube version

try java sdk 17

put back sonarqube plugin version
    @BillCarsonFr
    BillCarsonFr committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    b5dbb91 View commit details
    Browse the repository at this point in the history

  2. Merge pull request element-hq#8835 from element-hq/dependabot/gradle/… 

    …io.element.android-wysiwyg-2.37.3

Bump io.element.android:wysiwyg from 2.35.0 to 2.37.3
    @bmarty
    bmarty authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    cafb43b View commit details
    Browse the repository at this point in the history

  3. Merge pull request element-hq#8844 from element-hq/feature/valere/fix… 

    …_sonar_ci

Fix sonarqube CI error UnsupportedClassVersionError
    @BillCarsonFr
    BillCarsonFr authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    b116ce3 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Fix | Share room keys with dehydrated devices

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

  2. Add changelog

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

  3. Accept and pass any deviceKey payload to rust

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

  4. Merge pull request element-hq#8842 from element-hq/feature/bca/send_t… 

    …o_dehydrated_devices

Fix | Share room keys with dehydrated devices
    @BillCarsonFr
    BillCarsonFr authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    097d392 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. When sending user mentions, always send the user id as the fallback text

    @jmartinesp
    jmartinesp committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    f8345ab View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge pull request element-hq#8847 from element-hq/fix/jme/send-menti… 

    …ons-using-user-id-as-text

When sending user mentions, always send the user id as the fallback text
    @jmartinesp
    jmartinesp authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    4d27c84 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Replace *.element.io deep link with actual hosts 

    This is done to avoid incorrectly intercepting links in other apps, as Element X Android.
    @jmartinesp
    jmartinesp committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    a1dd3ba View commit details
    Browse the repository at this point in the history

  2. Add changelog

    @jmartinesp
    jmartinesp committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    0292749 View commit details
    Browse the repository at this point in the history

  3. Merge pull request element-hq#8850 from element-hq/fix/jme/8894-ea-in… 

    …tercepts-mas-urls

Replace `*.element.io` deep link with actual hosts
    @bmarty
    bmarty authored Jun 25, 2024
    Configuration menu
    Copy the full SHA
    b5758c5 View commit details
    Browse the repository at this point in the history

  4. Use BuildTools 35.0.0

    @bmarty
    bmarty committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    712b846 View commit details
    Browse the repository at this point in the history

  5. Changelog for version 1.6.18

    @bmarty
    bmarty committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    4a261a8 View commit details
    Browse the repository at this point in the history

  6. Adding fastlane file for version 1.6.18

    @bmarty
    bmarty committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    3f67bbf View commit details
    Browse the repository at this point in the history

  7. Merge branch 'release/1.6.18' into main

    @bmarty
    bmarty committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    0263183 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2024

  1. Merge tag 'v1.6.18' into synodim-merge-upstream

    Dominic Tubach committed Nov 1, 2024
    Configuration menu
    Copy the full SHA
    c5de40f View commit details
    Browse the repository at this point in the history