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.

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

vNext #1427

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

vNext #1427

wants to merge 22 commits into from

Commits on Oct 30, 2017

  1. Merge remote-tracking branch 'origin/master'

    evlentev committed Oct 30, 2017
    Configuration menu
    Copy the full SHA
    8dc0657 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2018

  1. Merge remote-tracking branch 'origin/master'

    evlentev committed Aug 1, 2018
    Configuration menu
    Copy the full SHA
    c3c15c7 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2019

  1. Merge remote-tracking branch 'origin/master'

    evlentev committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    9939d43 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. Configuration menu
    Copy the full SHA
    15a1e7b View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2019

  1. Merge remote-tracking branch 'origin/master'

    evlentev committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    81a713c View commit details
    Browse the repository at this point in the history
  2. wpf support

    evlentev committed Apr 4, 2019
    Configuration menu
    Copy the full SHA
    9ef3ff7 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2019

  1. wpf support

    evlentev committed Apr 18, 2019
    Configuration menu
    Copy the full SHA
    a1efd2f View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2019

  1. rebase

    evlentev committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    d26b863 View commit details
    Browse the repository at this point in the history
  2. cleanup

    evlentev committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    e1a9f1d View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feature/wpf' of https://github.com/melimion/FFImageLoading

     into feature/wpf
    
    # Conflicts:
    #	source/FFImageLoading.Forms.Wpf/CachedImageRenderer.cs
    #	source/FFImageLoading.Forms.Wpf/FFImageLoading.Forms.Wpf.csproj
    #	source/FFImageLoading.Wpf/Cache/ImageCache.cs
    #	source/FFImageLoading.Wpf/Extensions/TaskParameterPlatformExtensions.cs
    #	source/FFImageLoading.Wpf/FFImageLoading.Wpf.csproj
    #	source/FFImageLoading.Wpf/ImageService.cs
    #	source/FFImageLoading.Wpf/Targets/ImageTarget.cs
    evlentev committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    9a523ae View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2019

  1. Merge pull request #1248 from melimion/feature/wpf

    Basic WPF support
    daniel-luberda authored Sep 24, 2019
    Configuration menu
    Copy the full SHA
    f497f07 View commit details
    Browse the repository at this point in the history
  2. Fix indentation

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    726dfc5 View commit details
    Browse the repository at this point in the history
  3. Add initial files

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    72e106a View commit details
    Browse the repository at this point in the history
  4. Add new projects

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    314adbc View commit details
    Browse the repository at this point in the history
  5. Formatting

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    71a0574 View commit details
    Browse the repository at this point in the history
  6. Add project

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    acbdbe3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f1b5234 View commit details
    Browse the repository at this point in the history
  8. Fix sample project settings

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    6ad2d60 View commit details
    Browse the repository at this point in the history
  9. Fix csproj files

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    054a589 View commit details
    Browse the repository at this point in the history
  10. Fix references

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    0fe3cf9 View commit details
    Browse the repository at this point in the history
  11. Move mvvmcross

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    e8d7128 View commit details
    Browse the repository at this point in the history
  12. Add skiasharp dependency

    martijn00 committed Sep 24, 2019
    Configuration menu
    Copy the full SHA
    a58ec64 View commit details
    Browse the repository at this point in the history