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: resolve custom colors [WPB-11475] #3656

Merged
merged 8 commits into from
Nov 28, 2024
Merged

fix: resolve custom colors [WPB-11475] #3656

merged 8 commits into from
Nov 28, 2024

Commits on Nov 22, 2024

  1. fix: resolve custom colors [WPB-11475]

    @saleniuk
    saleniuk committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    6bc44b2 View commit details
    Browse the repository at this point in the history

  2. removed unused imports

    @saleniuk
    saleniuk committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    fed26d3 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/develop' into fix/r… 

    …esolve-custom-colors
    @saleniuk
    saleniuk committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    caf7880 View commit details
    Browse the repository at this point in the history

  4. revert some name changes

    @saleniuk
    saleniuk committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    956c032 View commit details
    Browse the repository at this point in the history

  5. detekt

    @saleniuk
    saleniuk committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    f6581bd View commit details
    Browse the repository at this point in the history

  6. fixed test theme

    @saleniuk
    saleniuk committed Nov 22, 2024
    Configuration menu
    Copy the full SHA
    5e0b11c View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/develop' into fix/r… 

    …esolve-custom-colors

# Conflicts:
#	app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsScreen.kt
#	app/src/main/kotlin/com/wire/android/ui/userprofile/self/CreateTeamInfoCard.kt
    @saleniuk
    saleniuk committed Nov 26, 2024
    Configuration menu
    Copy the full SHA
    a577c4a View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/develop' into fix/r… 

    …esolve-custom-colors
    @saleniuk
    saleniuk committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    1153318 View commit details
    Browse the repository at this point in the history