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

Rebase/element ios 1.11.19 #1115

Merged
merged 21 commits into from
Nov 6, 2024
Merged

Rebase/element ios 1.11.19 #1115

merged 21 commits into from
Nov 6, 2024

Commits on Sep 17, 2024

  1. Merge branch 'master' into develop

    @Velin92
    Velin92 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    77d427b View commit details
    Browse the repository at this point in the history

  2. Prepare for new sprint

    @Velin92
    Velin92 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    de8c3ec View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. update license

    @Velin92
    Velin92 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    9c13228 View commit details
    Browse the repository at this point in the history

  2. update license macro

    @Velin92
    Velin92 committed Sep 25, 2024
    Configuration menu
    Copy the full SHA
    761a5f1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7851 from element-hq/mauroromito/license_update

    @Velin92
    Velin92 authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    11d4148 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Libolm removal

    @Velin92
    Velin92 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    4b2029c View commit details
    Browse the repository at this point in the history

  2. fix

    @Velin92
    Velin92 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    7519524 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. update submodule

    @Velin92
    Velin92 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    d7e65fa View commit details
    Browse the repository at this point in the history

  2. removed unused code

    @Velin92
    Velin92 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    9d1ba61 View commit details
    Browse the repository at this point in the history

  3. remove obsolete tests

    @Velin92
    Velin92 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    611a906 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. update submodule

    @Velin92
    Velin92 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    6853e50 View commit details
    Browse the repository at this point in the history

  2. comments

    @Velin92
    Velin92 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    969aee2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7852 from element-hq/mauroromito/libolm_deprecate… 

    …d_removal

Libolm removal
    @Velin92
    Velin92 authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    7da255a View commit details
    Browse the repository at this point in the history

  4. version++

    @Velin92
    Velin92 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    9e3075e View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7855 from element-hq/release/1.11.19/release 

    Release 1.11.19
    @Velin92
    Velin92 authored Oct 15, 2024
    Configuration menu
    Copy the full SHA
    b0e6377 View commit details
    Browse the repository at this point in the history

  6. finish version++

    @Velin92
    Velin92 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    ab45f6c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'release/1.11.19/master'

    @Velin92
    Velin92 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    f823ab9 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2024

  1. Merge vector-im/element-ios v1.11.19 into element-rebase

    Nicolas Buquet committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    37f0a15 View commit details
    Browse the repository at this point in the history

  2. Resolve conflicts on Rebase/Element-v1.11.19 into Tchap

    Nicolas Buquet committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    d4d29ec View commit details
    Browse the repository at this point in the history

  3. Update matrix submodule

    Nicolas Buquet committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    88f2493 View commit details
    Browse the repository at this point in the history

  4. Add changelog

    Nicolas Buquet committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    6ea74b8 View commit details
    Browse the repository at this point in the history