{"push_id":882463429,"size":12,"distinct_size":0,"ref":"refs/heads/feature/carrie","head":"35bca9ffc873fecdd3f102f688405bc67e39f905","before":"e9f545dad364d753fe4bbe802bbfb9fdb130ab34","commits":[{"sha":"5e726d32c7a68ca97c69421d478653b0e58f6542","author":{"email":"c31fbc9a3022729ebee05a6a9493d9a06308b00b@qq.com","name":"dusensong"},"message":"资源","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/5e726d32c7a68ca97c69421d478653b0e58f6542"},{"sha":"00879651aa2e1df72d73f3270cd396568dbb7afc","author":{"email":"c31fbc9a3022729ebee05a6a9493d9a06308b00b@qq.com","name":"dusensong"},"message":"资源功能修改","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/00879651aa2e1df72d73f3270cd396568dbb7afc"},{"sha":"0db9d09d774c776bd71b26312c4ce02145493467","author":{"email":"c31fbc9a3022729ebee05a6a9493d9a06308b00b@qq.com","name":"dusensong"},"message":"资源功能修改","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/0db9d09d774c776bd71b26312c4ce02145493467"},{"sha":"0f2453c4d0232d4de2a8b3791826d22a0ea02aee","author":{"email":"0c7142a514a3ba881493c5480beac0fde45bbac1@sohu.com","name":"sanchibing"},"message":"处理分享","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/0f2453c4d0232d4de2a8b3791826d22a0ea02aee"},{"sha":"c3c6d922ccf33998e2b66b53d321d727951d2875","author":{"email":"c31fbc9a3022729ebee05a6a9493d9a06308b00b@qq.com","name":"dusensong"},"message":"资源功能修改","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/c3c6d922ccf33998e2b66b53d321d727951d2875"},{"sha":"43739819a5d587f716c077db2b2061cd3cc28ad3","author":{"email":"0c7142a514a3ba881493c5480beac0fde45bbac1@sohu.com","name":"sanchibing"},"message":"Merge branch 'feature/dss' into feature/sanchibing\n\nConflicts:\n\tapp/src/free/java/cn/wehack/spurious/model/template/TemplateManager.java\n\tapp/src/free/java/cn/wehack/spurious/vp/main/MainActivity.java\n\tapp/src/free/java/cn/wehack/spurious/vp/template/chat_tmpl_preview/ChatTemplateActivity.java\n\tapp/src/free/java/cn/wehack/spurious/vp/template/circle_tmpl_preview/CircleTemplatePresenter.java","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/43739819a5d587f716c077db2b2061cd3cc28ad3"},{"sha":"bd1136e4b4c1a149effd3e86890824cfb6a81670","author":{"email":"c31fbc9a3022729ebee05a6a9493d9a06308b00b@qq.com","name":"dusensong"},"message":"资源功能修改","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/bd1136e4b4c1a149effd3e86890824cfb6a81670"},{"sha":"f832aebd84dfa72b85623ba588bebdcad4ab72a9","author":{"email":"0c7142a514a3ba881493c5480beac0fde45bbac1@sohu.com","name":"sanchibing"},"message":"Merge branch 'feature/carrie' into feature/sanchibing\n\nConflicts:\n\tapp/src/free/java/cn/wehack/spurious/model/resource/ResourceManager.java\n\tapp/src/free/java/cn/wehack/spurious/support/helper/MoveToHelper.java\n\tapp/src/free/java/cn/wehack/spurious/vp/group/groupEdit/GroupChatEditAdapter.java\n\tapp/src/free/java/cn/wehack/spurious/vp/main/MainActivity.java\n\tapp/src/free/java/cn/wehack/spurious/vp/resource/ResourceFragment.java\n\tapp/src/free/java/cn/wehack/spurious/vp/resource/ResourcePresenter.java\n\tapp/src/free/java/cn/wehack/spurious/vp/resource/add_resource/AddResourceActivity.java\n\tapp/src/free/java/cn/wehack/spurious/vp/resource/add_resource/AddResourcePresenter.java\n\tapp/src/free/java/cn/wehack/spurious/vp/resource/resource_list/ResourceListAdapter.java\n\tapp/src/free/java/cn/wehack/spurious/vp/resource/resource_list/ResourceListFragment.java\n\tapp/src/free/java/cn/wehack/spurious/vp/resource/resource_list/ResourceListPresenter.java\n\tapp/src/main/java/cn/wehack/spurious/support/widget/dialog/MosaicDialog.java\n\tapp/src/main/java/cn/wehack/spurious/vp/chat/edit/ChatEditAdapter.java\n\tapp/src/main/java/cn/wehack/spurious/vp/chat/edit/ChatEditPresenter.java\n\tapp/src/main/java/cn/wehack/spurious/vp/moment/MomentActivity.java\n\tapp/src/main/java/cn/wehack/spurious/vp/moment/comment/CommentAddUserAdapter.java\n\tapp/src/main/java/cn/wehack/spurious/vp/moment/like/LikeUserGridAdapter.java\n\tapp/src/main/java/cn/wehack/spurious/vp/moment/preview/PreviewCommentListAdapter.java\n\tapp/src/trade/java/cn/wehack/spurious/support/helper/MoveToHelper.java\n\tapp/src/trade/java/cn/wehack/spurious/vp/chat/edit/ChatEditPresenter.java\n\tapp/src/trade/java/cn/wehack/spurious/vp/contact/adduser/AddContactUserPresenter.java\n\tapp/src/trade/java/cn/wehack/spurious/vp/contact/select_user/SelectUserActivity.java\n\tapp/src/trade/java/cn/wehack/spurious/vp/contact/select_user/SelectUserPresenter.java\n\tapp/src/trade/java/cn/wehack/spurious/vp/contact/user_list/UserListAdapter.java\n\tapp/src/trade/java/cn/wehack/spurious/vp/contact/user_list/UserListPresenter.java","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/f832aebd84dfa72b85623ba588bebdcad4ab72a9"},{"sha":"2af6ca969561e482806a188b4289d34c13627610","author":{"email":"c31fbc9a3022729ebee05a6a9493d9a06308b00b@qq.com","name":"dusensong"},"message":"资源功能修改","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/2af6ca969561e482806a188b4289d34c13627610"},{"sha":"91e0f9bdfd1658263b189106c7c086de66df59ea","author":{"email":"0c7142a514a3ba881493c5480beac0fde45bbac1@sohu.com","name":"sanchibing"},"message":"修改","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/91e0f9bdfd1658263b189106c7c086de66df59ea"},{"sha":"f7927fbcb6f14011bcc6e342f932eb30121ed56d","author":{"email":"0c7142a514a3ba881493c5480beac0fde45bbac1@sohu.com","name":"sanchibing"},"message":"Merge branch 'feature/dss' into feature/sanchibing","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/f7927fbcb6f14011bcc6e342f932eb30121ed56d"},{"sha":"35bca9ffc873fecdd3f102f688405bc67e39f905","author":{"email":"0c7142a514a3ba881493c5480beac0fde45bbac1@sohu.com","name":"sanchibing"},"message":"用户无登录处理","distinct":false,"url":"https://api.github.com/repos/zhichangterry/almost-true-android/commits/35bca9ffc873fecdd3f102f688405bc67e39f905"}]}