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

Merge IFrameworkElement and IView and Remove IPage #1875

Merged
merged 18 commits into from
Aug 3, 2021
Merged

Merge IFrameworkElement and IView and Remove IPage #1875

merged 18 commits into from
Aug 3, 2021

Commits on Jul 30, 2021

  1. Merge IFrameworkElement and IView

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    4d8ceb5 View commit details
    Browse the repository at this point in the history

  2. We cleaned up some things over time

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    fd55332 View commit details
    Browse the repository at this point in the history

  3. regions...

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    658204b View commit details
    Browse the repository at this point in the history

  4. Rename parameters

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    d7ed216 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/release/6.0.1xx-preview7' into d… 

    …ev/merge-ife-iv
    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    4ef45c8 View commit details
    Browse the repository at this point in the history

  6. Remove IPage entirely

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    184d252 View commit details
    Browse the repository at this point in the history

  7. windows

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    dfb4ffa View commit details
    Browse the repository at this point in the history

  8. IPage refs

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    29e0545 View commit details
    Browse the repository at this point in the history

  9. A page requires a IContentView

    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    a08799f View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/release/6.0.1xx-preview7' into d… 

    …ev/merge-ife-iv
    @mattleibow
    mattleibow committed Jul 30, 2021
    Configuration menu
    Copy the full SHA
    a138ac6 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2021

  1. Merge remote-tracking branch 'origin/release/6.0.1xx-preview7' into d… 

    …ev/merge-ife-iv
    @mattleibow
    mattleibow committed Jul 31, 2021
    Configuration menu
    Copy the full SHA
    e5ac0db View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2021

  1. Merge remote-tracking branch 'origin/release/6.0.1xx-preview7' into d… 

    …ev/merge-ife-iv
    @mattleibow
    mattleibow committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    e9fb465 View commit details
    Browse the repository at this point in the history

  2. IView

    @mattleibow
    mattleibow committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    8525b1f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/release/6.0.1xx-preview7' into d… 

    …ev/merge-ife-iv

# Conflicts:
#	src/Controls/src/Core/HandlerImpl/View.Impl.cs
    @mattleibow
    mattleibow committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    8075244 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2021

  1. Merge remote-tracking branch 'origin/release/6.0.1xx-preview7' into d… 

    …ev/merge-ife-iv
    @mattleibow
    mattleibow committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    2d4a999 View commit details
    Browse the repository at this point in the history

  2. Make it nullable

    @mattleibow
    mattleibow committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    2d91d02 View commit details
    Browse the repository at this point in the history

  3. :(

    @mattleibow
    mattleibow committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    0c07099 View commit details
    Browse the repository at this point in the history

  4. Revert ":(" 

    This reverts commit 0c07099.
    @mattleibow
    mattleibow committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    089c420 View commit details
    Browse the repository at this point in the history