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

[PM-11304] Ownership Not Defaulting To Org and Collection #4254

Merged
merged 16 commits into from
Nov 14, 2024
Merged

[PM-11304] Ownership Not Defaulting To Org and Collection #4254

merged 16 commits into from
Nov 14, 2024
+68 −27

Commits on Nov 6, 2024

  1. [PM-11303] Add button visible inside folders

    @andrebispo5
    andrebispo5 committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    96a3aa9 View commit details
    Browse the repository at this point in the history

  2. [PM-11303] Add selected folder id navigation parameter to preselect a… 

    …dd item folder
    @andrebispo5
    andrebispo5 committed Nov 6, 2024
    Configuration menu
    Copy the full SHA
    ad055f3 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. [PM-11303] Add missing tests

    @andrebispo5
    andrebispo5 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    a52588f View commit details
    Browse the repository at this point in the history

  2. [PM-11304] Add collection Id to navigation params

    @andrebispo5
    andrebispo5 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    b185412 View commit details
    Browse the repository at this point in the history

  3. [PM-11304] Enable fab for collection vault listings

    @andrebispo5
    andrebispo5 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    96f118e View commit details
    Browse the repository at this point in the history

  4. [PM-11304] Select owner and collection if creating cipher from an org… 

    … folder
    @andrebispo5
    andrebispo5 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    9213ad2 View commit details
    Browse the repository at this point in the history

  5. [PM-11304] Update show add cipher fab button logic

    @andrebispo5
    andrebispo5 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    3dc7657 View commit details
    Browse the repository at this point in the history

  6. [PM-11303] Code cleanup

    @andrebispo5
    andrebispo5 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    c70ff9b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'pm-11303/plus-icon-folders' into pm-11304/add-item-coll… 

    …ection

# Conflicts:
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt
    @andrebispo5
    andrebispo5 committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    4aef4dd View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. [PM-11304] Code clean up

    @andrebispo5
    andrebispo5 committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    0387f0b View commit details
    Browse the repository at this point in the history

  2. [PM-11304] Lint

    @andrebispo5
    andrebispo5 committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    a0e3ae0 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. Merge branch 'main' into pm-11304/add-item-collection 

    # Conflicts:
#	app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt
#	app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreenTest.kt
#	app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt
    @andrebispo5
    andrebispo5 committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    fdae12e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into pm-11304/add-item-collection 

    # Conflicts:
#	app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt
    @andrebispo5
    andrebispo5 committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    b2c3323 View commit details
    Browse the repository at this point in the history

  3. [PM-11304] Fix merge

    @andrebispo5
    andrebispo5 committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    7bb0eb2 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. [PM-11304] Fix merge, prevent ssh creation

    @andrebispo5
    andrebispo5 committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    e722c55 View commit details
    Browse the repository at this point in the history

  2. [PM-11304] Revert unwanted wrap chained functions

    @andrebispo5
    andrebispo5 committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    2ecd65e View commit details
    Browse the repository at this point in the history