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

feat: observe team app lock config (WPB-4476) #2380

Merged
merged 9 commits into from
Nov 2, 2023
Merged

feat: observe team app lock config (WPB-4476) #2380

merged 9 commits into from
Nov 2, 2023

Commits on Oct 27, 2023

  1. feat: observe team app lock config

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    a1958dd View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into team_applock 

    # Conflicts:
#	kalium
    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    ad673ca View commit details
    Browse the repository at this point in the history

  3. chore: kalium reference

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    8c1e0a3 View commit details
    Browse the repository at this point in the history

  4. chore: pass timeout to app lock disabled status

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    9c1e823 View commit details
    Browse the repository at this point in the history

  5. chore: detekt :)

    @ohassine
    ohassine committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    640de6d View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2023

  1. chore: cleanup

    @ohassine
    ohassine committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    31550cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into team_applock

    @ohassine
    ohassine committed Oct 31, 2023
    Configuration menu
    Copy the full SHA
    be21d95 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2023

  1. Merge branch 'develop' into team_applock

    @ohassine
    ohassine committed Nov 1, 2023
    Configuration menu
    Copy the full SHA
    8b7836e View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2023

  1. Merge remote-tracking branch 'origin/develop' into team_applock 

    # Conflicts:
#	app/src/test/kotlin/com/wire/android/ui/home/appLock/LockCodeTimeManagerTest.kt
#	kalium
    @ohassine
    ohassine committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    4d9e335 View commit details
    Browse the repository at this point in the history