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

滑动冲突 #126

Open
wants to merge 124 commits into
base: dev
Choose a base branch
from
Open

滑动冲突 #126

wants to merge 124 commits into from

Commits on Jun 7, 2016

  1. optimize

    huxq17 committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    cde543b View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. optimize

    huxq17 committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    26172b8 View commit details
    Browse the repository at this point in the history
  2. optimize

    huxq17 committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    04d1174 View commit details
    Browse the repository at this point in the history
  3. optimize

    huxq17 committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    92fc4b5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4be2a27 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. Configuration menu
    Copy the full SHA
    c6e7a31 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6d8ff2a View commit details
    Browse the repository at this point in the history
  3. optimize

    huxq17 committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    bbbfada View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2016

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

Commits on Jun 15, 2016

  1. 添加QQ群

    huxq17 committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    1afea6f View commit details
    Browse the repository at this point in the history
  2. Update README.md

    huxq17 committed Jun 15, 2016
    Configuration menu
    Copy the full SHA
    66aa215 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. 更换效果图的地址

    huxq17 committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    05ee094 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2016

  1. 解决issue #25

    huxq17 committed Jun 20, 2016
    Configuration menu
    Copy the full SHA
    5d8d73d View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2016

  1. Configuration menu
    Copy the full SHA
    c1afb03 View commit details
    Browse the repository at this point in the history
  2. 修改demo中展示的效果

    huxq17 committed Jun 24, 2016
    Configuration menu
    Copy the full SHA
    22214da View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2016

  1. 去除多余的log

    huxq17 committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    ad30177 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8ab31ac View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c6a402b View commit details
    Browse the repository at this point in the history
  4. update

    huxq17 committed Jul 8, 2016
    Configuration menu
    Copy the full SHA
    767c9c8 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

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

Commits on Jul 12, 2016

  1. optimize

    huxq17 committed Jul 12, 2016
    Configuration menu
    Copy the full SHA
    7b7c2d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. optimize

    huxq17 committed Jul 13, 2016
    Configuration menu
    Copy the full SHA
    da3299a View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2016

  1. optimize

    huxq17 committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    a79c83f View commit details
    Browse the repository at this point in the history
  2. 优化

    huxq17 committed Jul 14, 2016
    Configuration menu
    Copy the full SHA
    0fb20f0 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2016

  1. Configuration menu
    Copy the full SHA
    9e9f36a View commit details
    Browse the repository at this point in the history
  2. 版本升级到3.2.0

    huxq17 committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    a2a557c View commit details
    Browse the repository at this point in the history
  3. update

    huxq17 committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    8ef942c View commit details
    Browse the repository at this point in the history
  4. update readme.md

    huxq17 committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    05c65fb View commit details
    Browse the repository at this point in the history
  5. update readme.md

    huxq17 committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    2d40a3a View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. merge

    huxq17 committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    93023f6 View commit details
    Browse the repository at this point in the history
  2. optimize

    huxq17 committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    dc4b986 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2016

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

Commits on Aug 3, 2016

  1. Configuration menu
    Copy the full SHA
    5cff7a3 View commit details
    Browse the repository at this point in the history
  2. 更新demo

    huxq17 committed Aug 3, 2016
    Configuration menu
    Copy the full SHA
    794fc88 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0413742 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2016

  1. optimize

    huxq17 committed Aug 4, 2016
    Configuration menu
    Copy the full SHA
    ddae9bf View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2016

  1. Configuration menu
    Copy the full SHA
    4cfe104 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0d47d28 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab63d92 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2016

  1. optimize

    huxq17 committed Aug 12, 2016
    Configuration menu
    Copy the full SHA
    4d0ee7f View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2016

  1. optimize

    huxq17 committed Aug 15, 2016
    Configuration menu
    Copy the full SHA
    a0fd1d0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d846ef View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4f570db View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2016

  1. Configuration menu
    Copy the full SHA
    74cfa5a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    84027aa View commit details
    Browse the repository at this point in the history
  3. 添加空布局

    huxq17 committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    bf2cea3 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2016

  1. 正在开发空布局的功能

    huxq17 committed Aug 17, 2016
    Configuration menu
    Copy the full SHA
    68be80e View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2016

  1. 完善emptyview

    huxq17 committed Aug 18, 2016
    Configuration menu
    Copy the full SHA
    4c71056 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e4481d View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2016

  1. release 3.5.0 version

    huxq17 committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    4e1b0bc View commit details
    Browse the repository at this point in the history
  2. format

    huxq17 committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    6c5bcfa View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2016

  1. 优化demo

    huxq17 committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    51af21b View commit details
    Browse the repository at this point in the history
  2. optimize

    huxq17 committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    0980c75 View commit details
    Browse the repository at this point in the history
  3. optimize

    huxq17 committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    d061cff View commit details
    Browse the repository at this point in the history
  4. optimize

    huxq17 committed Aug 23, 2016
    Configuration menu
    Copy the full SHA
    72aa7d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2016

  1. optimize

    huxq17 committed Aug 24, 2016
    Configuration menu
    Copy the full SHA
    5bca799 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2016

  1. optimize

    huxq17 committed Aug 26, 2016
    Configuration menu
    Copy the full SHA
    3d6ec6f View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2016

  1. 添加笑脸刷新

    huxq17 committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    1841d16 View commit details
    Browse the repository at this point in the history
  2. 调整readme样式

    huxq17 committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    badbf07 View commit details
    Browse the repository at this point in the history
  3. 修改错误拼写

    huxq17 committed Aug 29, 2016
    Configuration menu
    Copy the full SHA
    bc786c8 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2016

  1. optimize

    huxq17 committed Sep 5, 2016
    Configuration menu
    Copy the full SHA
    d74be64 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2016

  1. fix issues #36

    huxq17 committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    7ab8cec View commit details
    Browse the repository at this point in the history
  2. Update README.md

    huxq17 committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    5d94115 View commit details
    Browse the repository at this point in the history
  3. update README.md

    huxq17 committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    b175e8b View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2016

  1. optimize

    huxq17 committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    7bc5c0b View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2016

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

Commits on Oct 14, 2016

  1. Update README.md

    huxq17 committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    565a788 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2016

  1. Update README.md

    huxq17 committed Nov 21, 2016
    Configuration menu
    Copy the full SHA
    9f0f7a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2016

  1. Update README.md

    huxq17 committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    dbecb85 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2016

  1. Configuration menu
    Copy the full SHA
    7e5c725 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8655f01 View commit details
    Browse the repository at this point in the history
  3. 修改依赖

    huxq17 committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    b343715 View commit details
    Browse the repository at this point in the history
  4. 优化demo

    huxq17 committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    744ac35 View commit details
    Browse the repository at this point in the history
  5. Update GridViewActivity.java

    huxq17 committed Dec 14, 2016
    Configuration menu
    Copy the full SHA
    33b2248 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2016

  1. Configuration menu
    Copy the full SHA
    7cd1dbd View commit details
    Browse the repository at this point in the history
  2. resolve conflict

    huxq17 committed Dec 15, 2016
    Configuration menu
    Copy the full SHA
    9172458 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2016

  1. Update README.md

    huxq17 committed Dec 29, 2016
    Configuration menu
    Copy the full SHA
    071b66d View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2017

  1. Configuration menu
    Copy the full SHA
    3b47f82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa24287 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2017

  1. fix bug #49

    huxq17 committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    41b3917 View commit details
    Browse the repository at this point in the history
  2. 升级到3.5.8

    huxq17 committed Jan 6, 2017
    Configuration menu
    Copy the full SHA
    46163dd View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2017

  1. Update README.md

    huxq17 committed Jan 11, 2017
    Configuration menu
    Copy the full SHA
    19fa544 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2017

  1. Configuration menu
    Copy the full SHA
    278c416 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    763d970 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2017

  1. fix issue #58

    huxq17 committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    d2e61af View commit details
    Browse the repository at this point in the history
  2. update readme.md

    huxq17 committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    f15442a View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2017

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

Commits on Mar 27, 2017

  1. 详见更新日志

    huxq17 committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    2a2498a View commit details
    Browse the repository at this point in the history
  2. Update README.md

    huxq17 committed Mar 27, 2017
    Configuration menu
    Copy the full SHA
    faa4e1a View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2017

  1. 详见更新日志2017-3-28

    huxq17 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    e8b521d View commit details
    Browse the repository at this point in the history
  2. 详见更新日志2017-3-28

    huxq17 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    88a04b8 View commit details
    Browse the repository at this point in the history
  3. 解决冲突

    huxq17 committed Mar 28, 2017
    Configuration menu
    Copy the full SHA
    f6513a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2017

  1. Update README.md

    huxq17 committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    a2facb7 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    huxq17 committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    d1d4767 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2017

  1. 见更新日志2017-4-14

    huxq17 committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    f2180f4 View commit details
    Browse the repository at this point in the history
  2. 见更新日志2017-4-14

    huxq17 committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    500262e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3698f64 View commit details
    Browse the repository at this point in the history
  4. Update README.md

    huxq17 committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    00634ed View commit details
    Browse the repository at this point in the history
  5. Update README.md

    huxq17 committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    7c5d863 View commit details
    Browse the repository at this point in the history
  6. Update README.md

    huxq17 committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    d817396 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. 详见更新日志2017-4-25

    huxq17 committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    fb47765 View commit details
    Browse the repository at this point in the history
  2. update readme

    huxq17 committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    231f7c2 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2017

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

Commits on May 4, 2017

  1. fix issue #78

    huxq17 committed May 4, 2017
    Configuration menu
    Copy the full SHA
    9c42335 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. optimize

    huxq17 committed May 16, 2017
    Configuration menu
    Copy the full SHA
    3b2d529 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2017

  1. 添加酒杯刷新

    fanyafeng committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    12dae50 View commit details
    Browse the repository at this point in the history
  2. fix bug #118

    fanyafeng committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    428ca15 View commit details
    Browse the repository at this point in the history
  3. 添加京东快递图片

    fanyafeng committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    131e5de View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2017

  1. 添加京东刷新

    fanyafeng committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    aa23b59 View commit details
    Browse the repository at this point in the history
  2. 京东刷新

    fanyafeng committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    aeda0ac View commit details
    Browse the repository at this point in the history
  3. 添加淘宝demo页面

    fanyafeng committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    6be5962 View commit details
    Browse the repository at this point in the history
  4. 更新md

    fanyafeng committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    d5bff0d View commit details
    Browse the repository at this point in the history
  5. 吃豆豆

    fanyafeng committed Sep 28, 2017
    Configuration menu
    Copy the full SHA
    cf50272 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2018

  1. Update README.md

    huxq17 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    833d0c9 View commit details
    Browse the repository at this point in the history
  2. Update README.md

    huxq17 committed Jun 25, 2018
    Configuration menu
    Copy the full SHA
    ba32db3 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2018

  1. 添加新方式

    fanyafeng committed Oct 2, 2018
    Configuration menu
    Copy the full SHA
    b8d02eb View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2018

  1. Update README.md

    huxq17 committed Oct 29, 2018
    Configuration menu
    Copy the full SHA
    cb6723a View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2020

  1. Author: fanyafeng

    Email: fanyafeng@live.cn
    Modify:
    1.更新gradle版本号
    fanyafeng committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    8396e0f View commit details
    Browse the repository at this point in the history
  2. Author: fanyafeng

    Email: fanyafeng@live.cn
    Modify:
    1.更新gradle版本
    fanyafeng committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    eeb3742 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'fanyafeng'

    fanyafeng committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    ce43532 View commit details
    Browse the repository at this point in the history
  4. Author: fanyafeng

    Email: fanyafeng@live.cn
    Modify:
    1.更新平台到androidX
    fanyafeng committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    979cc06 View commit details
    Browse the repository at this point in the history
  5. Author: fanyafeng

    Email: fanyafeng@live.cn
    Modify:
    1.更新readme
    2.更新依赖
    fanyafeng committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    2a37a6e View commit details
    Browse the repository at this point in the history
  6. Author: fanyafeng

    Email: fanyafeng@live.cn
    Modify:
    1.fix bug
    2.部分文件转kt
    fanyafeng committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    ac1d6aa View commit details
    Browse the repository at this point in the history
  7. Author: fanyafeng

    Email: fanyafeng@live.cn
    Modify:
    1.添加刷新方式
    fanyafeng committed Jun 13, 2020
    Configuration menu
    Copy the full SHA
    c5caf3b View commit details
    Browse the repository at this point in the history