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

fixed a ViewPager on the top of PtrFrameLayout touch conflict issue #157

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

fixed a ViewPager on the top of PtrFrameLayout touch conflict issue #157

wants to merge 14 commits into from

Commits on Sep 8, 2015

  1. Finished the UI part of Load More

    Weizhou He authored and Weizhou He committed Sep 8, 2015
    Configuration menu
    Copy the full SHA
    149c34e View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2015

  1. fixed a ViewPager on the top of PtrFrameLayout touch conflict issue

    changli.scl committed Oct 9, 2015
    Configuration menu
    Copy the full SHA
    6d69ea3 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2015

  1. Supported auto-load-more and added a call back for load more.

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    5518955 View commit details
    Browse the repository at this point in the history

  2. Updated README

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    9642340 View commit details
    Browse the repository at this point in the history

  3. Updated readme

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    79f946f View commit details
    Browse the repository at this point in the history

  4. added the mode option

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    70a1580 View commit details
    Browse the repository at this point in the history

  5. Saving wrong commits

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    27b59c8 View commit details
    Browse the repository at this point in the history

  6. Saving wrong commits

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    b45dad0 View commit details
    Browse the repository at this point in the history

  7. Added the default footer

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    1a9cc41 View commit details
    Browse the repository at this point in the history

  8. Updated the demo

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    d4e7d5f View commit details
    Browse the repository at this point in the history

  9. Disable touch events when footer is hiding

    @captainbupt
    captainbupt committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    6e076f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2015

  1. Fixed the conflicts

    @captainbupt
    captainbupt committed Dec 1, 2015
    Configuration menu
    Copy the full SHA
    b1265fc View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2016

  1. merge load more

    五斗 committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    2a8a191 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'captainbupt-master'

    五斗 committed Feb 19, 2016
    Configuration menu
    Copy the full SHA
    6aff525 View commit details
    Browse the repository at this point in the history