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.16 #1061

Merged
merged 35 commits into from
Jun 6, 2024
Merged

Rebase against Element Android v1.6.16 #1061

merged 35 commits into from
Jun 6, 2024

Commits on Sep 13, 2022

  1. adding android 12 url deeplink support 

    - urls must be verified in order for deeplinks to be enabled by the system
    @ouchadam
    ouchadam committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    af59f65 View commit details
    Browse the repository at this point in the history

  2. capture all element subdomains, means we can verify on the parent ins… 

    …tead of all subs
    @ouchadam
    ouchadam committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    4e068a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Store the formattedText to the draft, to be able to restore the for… 

    …matting. #7466
    @bmarty
    bmarty committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    423b921 View commit details
    Browse the repository at this point in the history

  2. Keep the current message formatting when switching between composer m… 

    …ode (Regular, Reply, etc.)
    @bmarty
    bmarty committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    6a30a2e View commit details
    Browse the repository at this point in the history

  3. changelog

    @bmarty
    bmarty committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    054af4d View commit details
    Browse the repository at this point in the history

  4. Remove unused import

    @bmarty
    bmarty committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    a17c75a View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Add dependency on com.github.matrix-org:matrix-analytics-events and… 

    … remove local plan and management of its import.
    @bmarty
    bmarty committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    6e1b346 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Sync Emojis

    @bmarty
    bmarty authored Apr 1, 2024
    Configuration menu
    Copy the full SHA
    e337be2 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Merge tag 'v1.6.14' into develop 

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

  2. version++

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

  3. When reporting a user, use the membership state eventId for the eventId.

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

  4. Merge pull request #8798 from element-hq/feature/bma/reportUserStateE… 

    …vent

When reporting a user, use the membership state eventId for the eventId.
    @bmarty
    bmarty authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    9b4394b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8795 from element-hq/sync-emojis 

    Sync Emojis
    @bmarty
    bmarty authored Apr 2, 2024
    Configuration menu
    Copy the full SHA
    5ccc486 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Analyics: stop double reporting posthog utds

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

Commits on Apr 5, 2024

  1. Merge pull request #8801 from element-hq/feature/bca/stop_double_repo… 

    …rting_utds

Analyics: stop double reporting posthog utds
    @BillCarsonFr
    BillCarsonFr authored Apr 5, 2024
    Configuration menu
    Copy the full SHA
    a1823b0 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

  1. fix: update local file access permission

    @yostyle
    yostyle committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    33d09ec View commit details
    Browse the repository at this point in the history

Commits on May 2, 2024

  1. Merge pull request #6225 from element-hq/feature/adm/android-12-deepl… 

    …inks

Fixing Android 12 url deeplinks
    @bmarty
    bmarty authored May 2, 2024
    Configuration menu
    Copy the full SHA
    305372c View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Add note about MSC3886, MSC3903 and MSC3906 being closed

    @hughns
    hughns committed May 3, 2024
    Configuration menu
    Copy the full SHA
    a8a9c61 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Bump posthog version to 3.2.0

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

  2. Add change log

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

  3. Fix posthog tests

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

Commits on May 16, 2024

  1. TODO must not be followed by :

    @bmarty
    bmarty authored May 16, 2024
    Configuration menu
    Copy the full SHA
    2362fcd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8810 from yostyle/yostyle/fix_file_permission 

    fix: update local file access permission
    @bmarty
    bmarty authored May 16, 2024
    Configuration menu
    Copy the full SHA
    0e94a49 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8817 from element-hq/hughns/qr-mscs-closed 

    Add note about MSC3886, MSC3903 and MSC3906 being closed
    @bmarty
    bmarty authored May 16, 2024
    Configuration menu
    Copy the full SHA
    085bf82 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #8790 from element-hq/feature/bma/externalAnalytic… 

    …sPlan

Add dependency on `com.github.matrix-org:matrix-analytics-events`
    @bmarty
    bmarty authored May 16, 2024
    Configuration menu
    Copy the full SHA
    f9a8451 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8820 from element-hq/feature/bca/bump_posthog_ver… 

    …sion_3

Bump posthog version to 3.2.0
    @bmarty
    bmarty authored May 16, 2024
    Configuration menu
    Copy the full SHA
    4acbe4e View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. Bump rust sdk crypto to 0.4.1

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

  2. Add change log

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

  3. Fix regression on send button visibility.

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

Commits on May 28, 2024

  1. Merge pull request #8838 from element-hq/feature/bca/bump_crypto_sdk_… 

    …0.4.1

Bump rust sdk crypto to 0.4.1
    @bmarty
    bmarty authored May 28, 2024
    Configuration menu
    Copy the full SHA
    204244b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8743 from element-hq/feature/bma/editorIssue 

    Fix Rich Text Editor issues: save formatted text in draft and keep formatting when switching between modes
    @ganfra
    ganfra authored May 28, 2024
    Configuration menu
    Copy the full SHA
    22f69ec View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Changelog for version 1.6.16

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

  2. Adding fastlane file for version 1.6.16

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

  3. Merge branch 'release/1.6.16' into main

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

Commits on Jun 6, 2024

  1. Merge tag 'v1.6.16' into rebase/element-android-1.6.16

    @yostyle
    yostyle committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    861500f View commit details
    Browse the repository at this point in the history