-
Notifications
You must be signed in to change notification settings - Fork 503
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
unual
wants to merge
124
commits into
dev
Choose a base branch
from
master
base: dev
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Commits on Jun 7, 2016
-
huxq17 committed
Jun 7, 2016 Configuration menu - View commit details
-
Copy full SHA for cde543b - Browse repository at this point
Copy the full SHA cde543bView commit details
Commits on Jun 8, 2016
-
huxq17 committed
Jun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 26172b8 - Browse repository at this point
Copy the full SHA 26172b8View commit details -
huxq17 committed
Jun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 04d1174 - Browse repository at this point
Copy the full SHA 04d1174View commit details -
huxq17 committed
Jun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 92fc4b5 - Browse repository at this point
Copy the full SHA 92fc4b5View commit details -
去掉XRefreshViewFooter中onStateReady中的show(true)
huxq17 committedJun 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 4be2a27 - Browse repository at this point
Copy the full SHA 4be2a27View commit details
Commits on Jun 9, 2016
-
Configuration menu - View commit details
-
Copy full SHA for c6e7a31 - Browse repository at this point
Copy the full SHA c6e7a31View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6d8ff2a - Browse repository at this point
Copy the full SHA 6d8ff2aView commit details -
Configuration menu - View commit details
-
Copy full SHA for bbbfada - Browse repository at this point
Copy the full SHA bbbfadaView commit details
Commits on Jun 13, 2016
-
解决在XRefreshView的布局中设置padding时布局显示不正确的问题
huxq17 committedJun 13, 2016 Configuration menu - View commit details
-
Copy full SHA for 8440d9e - Browse repository at this point
Copy the full SHA 8440d9eView commit details
Commits on Jun 15, 2016
-
huxq17 committed
Jun 15, 2016 Configuration menu - View commit details
-
Copy full SHA for 1afea6f - Browse repository at this point
Copy the full SHA 1afea6fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 66aa215 - Browse repository at this point
Copy the full SHA 66aa215View commit details
Commits on Jun 17, 2016
-
huxq17 committed
Jun 17, 2016 Configuration menu - View commit details
-
Copy full SHA for 05ee094 - Browse repository at this point
Copy the full SHA 05ee094View commit details
Commits on Jun 20, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 5d8d73d - Browse repository at this point
Copy the full SHA 5d8d73dView commit details
Commits on Jun 24, 2016
-
huxq17 committed
Jun 24, 2016 Configuration menu - View commit details
-
Copy full SHA for c1afb03 - Browse repository at this point
Copy the full SHA c1afb03View commit details -
huxq17 committed
Jun 24, 2016 Configuration menu - View commit details
-
Copy full SHA for 22214da - Browse repository at this point
Copy the full SHA 22214daView commit details
Commits on Jul 8, 2016
-
huxq17 committed
Jul 8, 2016 Configuration menu - View commit details
-
Copy full SHA for ad30177 - Browse repository at this point
Copy the full SHA ad30177View commit details -
huxq17 committed
Jul 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 8ab31ac - Browse repository at this point
Copy the full SHA 8ab31acView commit details -
解决在viewpager中从第二个页面开始,footerview的progressbar布局位置不正确的问题
huxq17 committedJul 8, 2016 Configuration menu - View commit details
-
Copy full SHA for c6a402b - Browse repository at this point
Copy the full SHA c6a402bView commit details -
huxq17 committed
Jul 8, 2016 Configuration menu - View commit details
-
Copy full SHA for 767c9c8 - Browse repository at this point
Copy the full SHA 767c9c8View commit details
Commits on Jul 11, 2016
-
添加Recyclerview非自动加载更多时,松开加载更多的功能
huxq17 committedJul 11, 2016 Configuration menu - View commit details
-
Copy full SHA for b4dd609 - Browse repository at this point
Copy the full SHA b4dd609View commit details
Commits on Jul 12, 2016
-
huxq17 committed
Jul 12, 2016 Configuration menu - View commit details
-
Copy full SHA for 7b7c2d2 - Browse repository at this point
Copy the full SHA 7b7c2d2View commit details
Commits on Jul 13, 2016
-
huxq17 committed
Jul 13, 2016 Configuration menu - View commit details
-
Copy full SHA for da3299a - Browse repository at this point
Copy the full SHA da3299aView commit details
Commits on Jul 14, 2016
-
huxq17 committed
Jul 14, 2016 Configuration menu - View commit details
-
Copy full SHA for a79c83f - Browse repository at this point
Copy the full SHA a79c83fView commit details -
huxq17 committed
Jul 14, 2016 Configuration menu - View commit details
-
Copy full SHA for 0fb20f0 - Browse repository at this point
Copy the full SHA 0fb20f0View commit details
Commits on Jul 15, 2016
-
添加防拉钩的Recyclerview松开加载更多的功能,并解决了若干bug
huxq17 committedJul 15, 2016 Configuration menu - View commit details
-
Copy full SHA for 9e9f36a - Browse repository at this point
Copy the full SHA 9e9f36aView commit details -
huxq17 committed
Jul 15, 2016 Configuration menu - View commit details
-
Copy full SHA for a2a557c - Browse repository at this point
Copy the full SHA a2a557cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8ef942c - Browse repository at this point
Copy the full SHA 8ef942cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 05c65fb - Browse repository at this point
Copy the full SHA 05c65fbView commit details -
Configuration menu - View commit details
-
Copy full SHA for 2d40a3a - Browse repository at this point
Copy the full SHA 2d40a3aView commit details
Commits on Jul 26, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 93023f6 - Browse repository at this point
Copy the full SHA 93023f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for dc4b986 - Browse repository at this point
Copy the full SHA dc4b986View commit details
Commits on Jul 27, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 3b41106 - Browse repository at this point
Copy the full SHA 3b41106View commit details
Commits on Aug 3, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 5cff7a3 - Browse repository at this point
Copy the full SHA 5cff7a3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 794fc88 - Browse repository at this point
Copy the full SHA 794fc88View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0413742 - Browse repository at this point
Copy the full SHA 0413742View commit details
Commits on Aug 4, 2016
-
Configuration menu - View commit details
-
Copy full SHA for ddae9bf - Browse repository at this point
Copy the full SHA ddae9bfView commit details
Commits on Aug 8, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 4cfe104 - Browse repository at this point
Copy the full SHA 4cfe104View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0d47d28 - Browse repository at this point
Copy the full SHA 0d47d28View commit details -
Configuration menu - View commit details
-
Copy full SHA for ab63d92 - Browse repository at this point
Copy the full SHA ab63d92View commit details
Commits on Aug 12, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 4d0ee7f - Browse repository at this point
Copy the full SHA 4d0ee7fView commit details
Commits on Aug 15, 2016
-
Configuration menu - View commit details
-
Copy full SHA for a0fd1d0 - Browse repository at this point
Copy the full SHA a0fd1d0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d846ef - Browse repository at this point
Copy the full SHA 5d846efView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4f570db - Browse repository at this point
Copy the full SHA 4f570dbView commit details
Commits on Aug 16, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 74cfa5a - Browse repository at this point
Copy the full SHA 74cfa5aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 84027aa - Browse repository at this point
Copy the full SHA 84027aaView commit details -
Configuration menu - View commit details
-
Copy full SHA for bf2cea3 - Browse repository at this point
Copy the full SHA bf2cea3View commit details
Commits on Aug 17, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 68be80e - Browse repository at this point
Copy the full SHA 68be80eView commit details
Commits on Aug 18, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 4c71056 - Browse repository at this point
Copy the full SHA 4c71056View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3e4481d - Browse repository at this point
Copy the full SHA 3e4481dView commit details
Commits on Aug 19, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 4e1b0bc - Browse repository at this point
Copy the full SHA 4e1b0bcView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6c5bcfa - Browse repository at this point
Copy the full SHA 6c5bcfaView commit details
Commits on Aug 23, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 51af21b - Browse repository at this point
Copy the full SHA 51af21bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0980c75 - Browse repository at this point
Copy the full SHA 0980c75View commit details -
Configuration menu - View commit details
-
Copy full SHA for d061cff - Browse repository at this point
Copy the full SHA d061cffView commit details -
Configuration menu - View commit details
-
Copy full SHA for 72aa7d7 - Browse repository at this point
Copy the full SHA 72aa7d7View commit details
Commits on Aug 24, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 5bca799 - Browse repository at this point
Copy the full SHA 5bca799View commit details
Commits on Aug 26, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 3d6ec6f - Browse repository at this point
Copy the full SHA 3d6ec6fView commit details
Commits on Aug 29, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 1841d16 - Browse repository at this point
Copy the full SHA 1841d16View commit details -
Configuration menu - View commit details
-
Copy full SHA for badbf07 - Browse repository at this point
Copy the full SHA badbf07View commit details -
Configuration menu - View commit details
-
Copy full SHA for bc786c8 - Browse repository at this point
Copy the full SHA bc786c8View commit details
Commits on Sep 5, 2016
-
Configuration menu - View commit details
-
Copy full SHA for d74be64 - Browse repository at this point
Copy the full SHA d74be64View commit details
Commits on Sep 6, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 7ab8cec - Browse repository at this point
Copy the full SHA 7ab8cecView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d94115 - Browse repository at this point
Copy the full SHA 5d94115View commit details -
Configuration menu - View commit details
-
Copy full SHA for b175e8b - Browse repository at this point
Copy the full SHA b175e8bView commit details
Commits on Sep 8, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 7bc5c0b - Browse repository at this point
Copy the full SHA 7bc5c0bView commit details
Commits on Sep 28, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 6c72062 - Browse repository at this point
Copy the full SHA 6c72062View commit details
Commits on Oct 14, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 565a788 - Browse repository at this point
Copy the full SHA 565a788View commit details
Commits on Nov 21, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 9f0f7a1 - Browse repository at this point
Copy the full SHA 9f0f7a1View commit details
Commits on Nov 23, 2016
-
Configuration menu - View commit details
-
Copy full SHA for dbecb85 - Browse repository at this point
Copy the full SHA dbecb85View commit details
Commits on Dec 14, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 7e5c725 - Browse repository at this point
Copy the full SHA 7e5c725View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8655f01 - Browse repository at this point
Copy the full SHA 8655f01View commit details -
Configuration menu - View commit details
-
Copy full SHA for b343715 - Browse repository at this point
Copy the full SHA b343715View commit details -
Configuration menu - View commit details
-
Copy full SHA for 744ac35 - Browse repository at this point
Copy the full SHA 744ac35View commit details -
Configuration menu - View commit details
-
Copy full SHA for 33b2248 - Browse repository at this point
Copy the full SHA 33b2248View commit details
Commits on Dec 15, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 7cd1dbd - Browse repository at this point
Copy the full SHA 7cd1dbdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9172458 - Browse repository at this point
Copy the full SHA 9172458View commit details
Commits on Dec 29, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 071b66d - Browse repository at this point
Copy the full SHA 071b66dView commit details
Commits on Jan 4, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 3b47f82 - Browse repository at this point
Copy the full SHA 3b47f82View commit details -
Configuration menu - View commit details
-
Copy full SHA for fa24287 - Browse repository at this point
Copy the full SHA fa24287View commit details
Commits on Jan 6, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 41b3917 - Browse repository at this point
Copy the full SHA 41b3917View commit details -
Configuration menu - View commit details
-
Copy full SHA for 46163dd - Browse repository at this point
Copy the full SHA 46163ddView commit details
Commits on Jan 11, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 19fa544 - Browse repository at this point
Copy the full SHA 19fa544View commit details
Commits on Jan 13, 2017
-
解决Recyclerview使用StaggeredGridLayoutManager时,添加的headerview不能使用全部宽度的问题(…
…headview layout won't use all span area)。
Configuration menu - View commit details
-
Copy full SHA for 278c416 - Browse repository at this point
Copy the full SHA 278c416View commit details -
Configuration menu - View commit details
-
Copy full SHA for 763d970 - Browse repository at this point
Copy the full SHA 763d970View commit details
Commits on Feb 16, 2017
-
Configuration menu - View commit details
-
Copy full SHA for d2e61af - Browse repository at this point
Copy the full SHA d2e61afView commit details -
Configuration menu - View commit details
-
Copy full SHA for f15442a - Browse repository at this point
Copy the full SHA f15442aView commit details
Commits on Feb 17, 2017
-
Configuration menu - View commit details
-
Copy full SHA for fd04458 - Browse repository at this point
Copy the full SHA fd04458View commit details
Commits on Mar 27, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 2a2498a - Browse repository at this point
Copy the full SHA 2a2498aView commit details -
Configuration menu - View commit details
-
Copy full SHA for faa4e1a - Browse repository at this point
Copy the full SHA faa4e1aView commit details
Commits on Mar 28, 2017
-
Configuration menu - View commit details
-
Copy full SHA for e8b521d - Browse repository at this point
Copy the full SHA e8b521dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 88a04b8 - Browse repository at this point
Copy the full SHA 88a04b8View commit details -
Configuration menu - View commit details
-
Copy full SHA for f6513a8 - Browse repository at this point
Copy the full SHA f6513a8View commit details
Commits on Mar 29, 2017
-
Configuration menu - View commit details
-
Copy full SHA for a2facb7 - Browse repository at this point
Copy the full SHA a2facb7View commit details -
Configuration menu - View commit details
-
Copy full SHA for d1d4767 - Browse repository at this point
Copy the full SHA d1d4767View commit details
Commits on Apr 14, 2017
-
Configuration menu - View commit details
-
Copy full SHA for f2180f4 - Browse repository at this point
Copy the full SHA f2180f4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 500262e - Browse repository at this point
Copy the full SHA 500262eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3698f64 - Browse repository at this point
Copy the full SHA 3698f64View commit details -
Configuration menu - View commit details
-
Copy full SHA for 00634ed - Browse repository at this point
Copy the full SHA 00634edView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7c5d863 - Browse repository at this point
Copy the full SHA 7c5d863View commit details -
Configuration menu - View commit details
-
Copy full SHA for d817396 - Browse repository at this point
Copy the full SHA d817396View commit details
Commits on Apr 25, 2017
-
Configuration menu - View commit details
-
Copy full SHA for fb47765 - Browse repository at this point
Copy the full SHA fb47765View commit details -
Configuration menu - View commit details
-
Copy full SHA for 231f7c2 - Browse repository at this point
Copy the full SHA 231f7c2View commit details
Commits on May 3, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 46f9fec - Browse repository at this point
Copy the full SHA 46f9fecView commit details
Commits on May 4, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 9c42335 - Browse repository at this point
Copy the full SHA 9c42335View commit details
Commits on May 16, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 3b2d529 - Browse repository at this point
Copy the full SHA 3b2d529View commit details
Commits on Sep 27, 2017
-
fanyafeng committed
Sep 27, 2017 Configuration menu - View commit details
-
Copy full SHA for 12dae50 - Browse repository at this point
Copy the full SHA 12dae50View commit details -
Configuration menu - View commit details
-
Copy full SHA for 428ca15 - Browse repository at this point
Copy the full SHA 428ca15View commit details -
fanyafeng committed
Sep 27, 2017 Configuration menu - View commit details
-
Copy full SHA for 131e5de - Browse repository at this point
Copy the full SHA 131e5deView commit details
Commits on Sep 28, 2017
-
fanyafeng committed
Sep 28, 2017 Configuration menu - View commit details
-
Copy full SHA for aa23b59 - Browse repository at this point
Copy the full SHA aa23b59View commit details -
fanyafeng committed
Sep 28, 2017 Configuration menu - View commit details
-
Copy full SHA for aeda0ac - Browse repository at this point
Copy the full SHA aeda0acView commit details -
fanyafeng committed
Sep 28, 2017 Configuration menu - View commit details
-
Copy full SHA for 6be5962 - Browse repository at this point
Copy the full SHA 6be5962View commit details -
fanyafeng committed
Sep 28, 2017 Configuration menu - View commit details
-
Copy full SHA for d5bff0d - Browse repository at this point
Copy the full SHA d5bff0dView commit details -
fanyafeng committed
Sep 28, 2017 Configuration menu - View commit details
-
Copy full SHA for cf50272 - Browse repository at this point
Copy the full SHA cf50272View commit details
Commits on Jun 25, 2018
-
Configuration menu - View commit details
-
Copy full SHA for 833d0c9 - Browse repository at this point
Copy the full SHA 833d0c9View commit details -
Configuration menu - View commit details
-
Copy full SHA for ba32db3 - Browse repository at this point
Copy the full SHA ba32db3View commit details
Commits on Oct 2, 2018
-
fanyafeng committed
Oct 2, 2018 Configuration menu - View commit details
-
Copy full SHA for b8d02eb - Browse repository at this point
Copy the full SHA b8d02ebView commit details
Commits on Oct 29, 2018
-
Configuration menu - View commit details
-
Copy full SHA for cb6723a - Browse repository at this point
Copy the full SHA cb6723aView commit details
Commits on Jun 13, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 8396e0f - Browse repository at this point
Copy the full SHA 8396e0fView commit details -
Configuration menu - View commit details
-
Copy full SHA for eeb3742 - Browse repository at this point
Copy the full SHA eeb3742View commit details -
Configuration menu - View commit details
-
Copy full SHA for ce43532 - Browse repository at this point
Copy the full SHA ce43532View commit details -
Configuration menu - View commit details
-
Copy full SHA for 979cc06 - Browse repository at this point
Copy the full SHA 979cc06View commit details -
Email: fanyafeng@live.cn Modify: 1.更新readme 2.更新依赖
Configuration menu - View commit details
-
Copy full SHA for 2a37a6e - Browse repository at this point
Copy the full SHA 2a37a6eView commit details -
Email: fanyafeng@live.cn Modify: 1.fix bug 2.部分文件转kt
Configuration menu - View commit details
-
Copy full SHA for ac1d6aa - Browse repository at this point
Copy the full SHA ac1d6aaView commit details -
Configuration menu - View commit details
-
Copy full SHA for c5caf3b - Browse repository at this point
Copy the full SHA c5caf3bView commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.