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 (October 4th) #37

Merged
merged 23 commits into from
Oct 4, 2024
Merged

Merge upstream (October 4th) #37

merged 23 commits into from
Oct 4, 2024

Commits on Aug 19, 2024

  1. update test and add fix

    @keks
    keks committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    ebb5b7c View commit details
    Browse the repository at this point in the history

  2. get rid of CoreGroup::merge_staged_commit

    @keks
    keks committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    19d7a90 View commit details
    Browse the repository at this point in the history

  3. fix clippy

    @keks
    keks committed Aug 19, 2024
    Configuration menu
    Copy the full SHA
    bf0439b View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Merge pull request openmls#1646 from openmls/keks/fix/persist_message… 

    …_secrets

Fix Missing Persisting of Message Secrets
    @franziskuskiefer
    franziskuskiefer authored Aug 20, 2024
    Configuration menu
    Copy the full SHA
    17c465d View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. bump versions and fix build error

    @keks
    keks committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    1cb2561 View commit details
    Browse the repository at this point in the history

  2. Merge pull request openmls#1648 from openmls/keks/bump-versions-pre.3 

    Bump versions and fix build error
    @franziskuskiefer
    franziskuskiefer authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    066eace View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Slightly refactor public group storage interface (openmls#1649) 

    * make function naming consistent in PublicStorage

* refactor and make PublicGroup::delete public
    @kkohbrok
    kkohbrok authored Aug 29, 2024
    Configuration menu
    Copy the full SHA
    9f1d5cf View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. Remove CoreGroup (openmls#1647)

    @kkohbrok
    kkohbrok authored Aug 30, 2024
    Configuration menu
    Copy the full SHA
    72c9d10 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Update links

    @raphaelrobert
    raphaelrobert committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    45bdb58 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2024

  1. Merge pull request openmls#1651 from openmls/raphael/update-links 

    Update links
    @franziskuskiefer
    franziskuskiefer authored Sep 3, 2024
    Configuration menu
    Copy the full SHA
    b9ebd9f View commit details
    Browse the repository at this point in the history

  2. bump crate versions for v0.6

    @franziskuskiefer
    franziskuskiefer committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    09cd6b8 View commit details
    Browse the repository at this point in the history

  3. update changeloog for v0.6

    @franziskuskiefer
    franziskuskiefer committed Sep 3, 2024
    Configuration menu
    Copy the full SHA
    5a67488 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Merge pull request openmls#1652 from openmls/franziskus/v0_6 

    Bump crate versions for v0.6
    @franziskuskiefer
    franziskuskiefer authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    5067034 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. fix docs

    @keks
    keks committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9ecb0ce View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2024

  1. Merge pull request openmls#1653 from openmls/keks/fix-docs 

    Fix docs
    @franziskuskiefer
    franziskuskiefer authored Sep 9, 2024
    Configuration menu
    Copy the full SHA
    7f3db49 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Add check and (basic) test for check 701: remove can't contain index … 

    …to blank leaf
    @keks
    keks committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    39e55a0 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. pacify clippy

    @keks
    keks committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    9867c8b View commit details
    Browse the repository at this point in the history

  2. use new id scheme for searchability

    @keks
    keks committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    7493e0a View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge pull request openmls#1655 from openmls/keks/fix-check-701 

    Add check and (basic) test for check 701: remove can't contain inde to blank leaf
    @franziskuskiefer
    franziskuskiefer authored Sep 20, 2024
    Configuration menu
    Copy the full SHA
    20042d7 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Update CONTRIBUTING.md

    @W95Psp
    W95Psp authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    ebcc6e4 View commit details
    Browse the repository at this point in the history

  2. Merge pull request openmls#1659 from W95Psp/patch-1 

    Fix a broken link in `CONTRIBUTING.md`
    @franziskuskiefer
    franziskuskiefer authored Oct 2, 2024
    Configuration menu
    Copy the full SHA
    8c9bfa4 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Merge remote-tracking branch 'upstream/main' into nm/merge-upstream-o… 

    …ctober-4
    @neekolas
    neekolas committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    9bc9756 View commit details
    Browse the repository at this point in the history

  2. Update code to match new styles

    @neekolas
    neekolas committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    90d1604 View commit details
    Browse the repository at this point in the history