GithubStar/Tangram-Android
1
0
Fork 0
mirror of https://github.com/alibaba/Tangram-Android.git synced 2026-10-17 05:07:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
155 Commits 22 Branches 38 Tags
dev_20180420
Commit Graph

155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MikeAfc b864fda57b Update version of UltraViewPager 2018-04-18 19:42:44 +08:00
longerian f775ba0250 Merge branch 'dev_20180413' into develop 2018-04-18 17:48:56 +08:00
longerian e176a4cd5e update gradle 2018-04-18 16:52:06 +08:00
longerian 77fdf9af62 Merge branch 'dev_20180413' into develop 2018-04-13 16:18:04 +08:00
longerian 9144b2619d fix #92 2018-04-13 16:16:09 +08:00
longerian 1cd0464502 fix #95 2018-04-13 15:29:44 +08:00
HarrisonXi 6a2db9412f Update README-ch.md 2018-04-09 15:41:06 +08:00
HarrisonXi afc09ee6a6 Update README.md 2018-04-09 15:39:46 +08:00
longerian f71641fd32 fix conflicts v2.2.3 2018-03-16 14:18:04 +08:00
longerian 1eea3f50ad Merge branch 'dev_20180316' into develop 2018-03-16 14:17:04 +08:00
longerian 6c29f365ff update vlayout 2018-03-16 11:42:33 +08:00
sjjwind 96ae2fde70 fix BannerView incorrect direction problem in banner listener. 2018-03-15 09:55:56 +08:00
longerian cb8ad43fb6 fix scroll direction flag 2018-03-13 19:46:48 +08:00
longerian 23d566cc1b stop timer when touch down; reset scroll direction when touch event finishes 2018-03-13 19:33:35 +08:00
longerian 3c7a01f891 stop timer when touch down; reset scroll direction when touch event finishes 2018-03-13 19:33:07 +08:00
longerian 751f09d979 update version v2.2.2 2018-03-11 21:48:49 +08:00
longerian 06759d2c5d Merge branch 'develop' 2018-03-11 21:47:59 +08:00
longerian 19fefc6bd2 Merge branch 'dev_20180309' into develop 2018-03-11 21:47:37 +08:00
longerian a3a1be922d fix #88 2018-03-07 15:25:51 +08:00
longerian f846ff10f4 Merge branch 'master' into develop 2018-02-28 10:54:47 +08:00
Xiaolong Hong 6a430fd39c Update README-ch.md 
add wechat group
v2.2.1 		2018-02-27 16:04:50 +08:00
Xiaolong Hong 2f154fa478 Update README.md 
add wechatgroup
 2018-02-27 16:03:58 +08:00
longerian 7b35fcfd10 fix conflicts 2018-02-26 21:37:03 +08:00
longerian 1beee89f95 Merge branch 'dev_20180224' into develop 2018-02-26 21:36:06 +08:00
longerian c0735b4324 do not auto recycler child view in container-scroll 2018-02-26 21:11:11 +08:00
longerian 7b2696b595 do not auto recycler child view in container-scroll 2018-02-26 21:09:28 +08:00
longerian 5495a3d89d update version v2.2.0 2018-02-22 16:56:55 +08:00
longerian b03ab99267 Merge branch 'develop' 2018-02-22 16:54:04 +08:00
longerian fb62d666e3 Merge branch 'dev_20180224' into develop 2018-02-22 16:53:41 +08:00
longerian e6a86519e7 Merge branch 'feature/parse_container_scroll' into dev_20180224 2018-02-22 16:53:10 +08:00
longerian 959de3251a fix #86 2018-02-22 16:37:15 +08:00
longerian 343d31fe1f support parse container-scroll in nested container 2018-02-22 16:03:57 +08:00
longerian 817c9f7bb0 update deploy script 2018-02-12 11:42:39 +08:00
longerian 9250f3a7ec fix #86 2018-02-12 11:01:45 +08:00
longerian d28fb0d4d5 Merge branch 'master' into dev_20180209 2018-02-12 09:57:01 +08:00
longerian 348928a26f Merge branch 'develop' v2.1.2 2018-02-07 17:31:49 +08:00
longerian d04bb0efff Merge branch 'dev_20180209' into develop 2018-02-07 17:31:32 +08:00
longerian 03e86c3d02 stop timer when screen off 2018-02-07 15:10:48 +08:00
longerian 927d39bc30 update version 2018-02-07 14:23:50 +08:00
longerian b3afedffe5 fix #83, fix header footer after last refractor T_T 2018-02-06 14:20:20 +08:00
longerian 8db00908e5 Merge branch 'develop' v2.1.1 2018-02-06 11:13:17 +08:00
longerian 6649278fbe Merge branch 'dev_20180202' into develop 2018-02-06 11:12:57 +08:00
longerian bd52fca601 update version 2018-02-06 11:12:31 +08:00
longerian 4d85bdbb13 stop auto when banner is invisible 2018-02-01 21:15:52 +08:00
longerian cd974400a3 stop auto when banner is invisible 2018-02-01 20:54:49 +08:00
longerian 88b3c424ca update version v2.1.0 2018-02-01 16:43:17 +08:00
longerian 84c8fc4f3c Merge branch 'develop' 2018-02-01 16:42:50 +08:00
longerian 7448081828 Merge branch 'feature/notify_range_change_tangram' into develop 2018-02-01 16:42:28 +08:00
longerian 05715a988b Merge branch 'feature/opt_banner' into feature/notify_range_change_tangram 2018-02-01 16:41:47 +08:00
longerian 5839f24611 remove log 2018-02-01 11:42:15 +08:00