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

fix: fix bug not displaying asset messages correctly #518

Merged
merged 7 commits into from
Apr 19, 2022
Merged

fix: fix bug not displaying asset messages correctly #518

merged 7 commits into from
Apr 19, 2022

Commits on Apr 18, 2022

  1. fix: fix bug not displaying asset messages correctly

    @gongracr
    gongracr committed Apr 18, 2022
    Configuration menu
    Copy the full SHA
    a7124f2 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2022

  1. Filter out display asset messages without id or decryption keys

    @gongracr
    gongracr committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    0ca5ab3 View commit details
    Browse the repository at this point in the history

  2. Bumped kalium

    @gongracr
    gongracr committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    22928be View commit details
    Browse the repository at this point in the history

  3. Removed wildcard

    @gongracr
    gongracr committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    027173a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:wireapp/wire-android-reloaded in… 

    …to fix/bug_asset_messages

# Conflicts:
#	kalium
    @gongracr
    gongracr committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    208018a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' of github.com:wireapp/wire-android-reloaded in… 

    …to fix/bug_asset_messages

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
#	kalium
    @gongracr
    gongracr committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    0f76873 View commit details
    Browse the repository at this point in the history

  6. updated kalium

    @gongracr
    gongracr committed Apr 19, 2022
    Configuration menu
    Copy the full SHA
    873d86f View commit details
    Browse the repository at this point in the history