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

Resolve merge conflicts 0.1.3 #3190

Merged
merged 10 commits into from
Aug 29, 2023
Merged

Resolve merge conflicts 0.1.3 #3190

merged 10 commits into from
Aug 29, 2023

Commits on Aug 21, 2023

  1. v0.1.3

    @rajatvijay
    rajatvijay committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    8c24240 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. add constraint copying to column extration logic

    @mathemancer
    mathemancer committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    348d721 View commit details
    Browse the repository at this point in the history

  2. Merge commit '60e80aad320b8286514933815b24d29126ae71ab' into cherry-p… 

    …ick-db-list-demo-mode
    @pavish
    pavish committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    6bbfbb4 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Merge pull request #3171 from centerofci/cherry-pick-db-list-demo-mode 

    Merge db list demo mode commits into release 0.1.3
    @mathemancer
    mathemancer committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    3a29db3 View commit details
    Browse the repository at this point in the history

  2. Merge branch '0.1.3' into fkey_regression_bufix

    @mathemancer
    mathemancer committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    dfe1a13 View commit details
    Browse the repository at this point in the history

  3. Move UserProfile to the App level context from Route level context

    @pavish
    pavish committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    01b908a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3175 from centerofci/fix-user-profile-store-context 

    Fix regression: Move UserProfile to the App level context from Route level context
    @seancolsen
    seancolsen committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    5c416a6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3168 from centerofci/fkey_regression_bufix 

    Add constraint copying to column extration logic
    @mathemancer
    mathemancer committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    9fd15fb View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge pull request #3187 from centerofci/0.1.3 

    0.1.3 release PR
    @mathemancer
    mathemancer committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    7f4a4df View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into resolve_merge_conflicts_0.1.3

    @mathemancer
    mathemancer committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    8fd0ad6 View commit details
    Browse the repository at this point in the history