GitHub user chenli3238 opened a pull request:
https://github.com/apache/incubator-weex/pull/156
0.10 androidå
³äºå è½½sdå¡ä¸jsé®é¢
æå
è½½SDå¡ä¸çæä¸ä¸ªweexçjsæåï¼ä½æ¯åæ¢ä¸å°è¯¥jsåä¸ç®å½çjsï¼æ该æä¹åè¿ä¸ªè¦åæ¢çjsçè·¯å¾ï¼æ±å©ãããæå·²ç»è¯è¿æ
åçSDå¡è·¯å¾åfileçURIè·¯å¾ï¼é½ä¸è¡
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-weex 0.12-dev
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-weex/pull/156.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #156
----
commit 529f51720e4d82c9a19ad0fb9cf7c85e8c633af5
Author: cxfeng <[email protected]>
Date: 2017-03-06T11:22:56Z
Merge branch '0.11-dev' of https://github.com/boboning/incubator-weex into
0.11-dev
commit a4b360962d71ed8a151918c8695911babae929bd
Author: ç
§ç <[email protected]>
Date: 2017-03-06T11:27:11Z
* [android] change member variable name
commit 79d00557cfec6c079058c9d720d6c0687504254b
Author: cxfeng <[email protected]>
Date: 2017-03-06T11:32:33Z
Merge branch 'feature-validate-support' of
https://github.com/168668660/incubator-weex into 0.11-dev
commit 6e9decbfb0aebce96919995e2c9c631ae6f24f8e
Author: éé£ <[email protected]>
Date: 2017-03-06T11:35:44Z
* [ios] copy updates block to avoid crash
commit e18f5512db8f4e9d6dd3ad69a7459477bcd29971
Author: cxfeng <[email protected]>
Date: 2017-03-06T11:37:33Z
Merge branch '0.11-dev' of https://github.com/xiayun200825/incubator-weex
into 0.11-dev
commit 7744e6280ada62ca782b3428f83b0f9289304c41
Author: éé£ <[email protected]>
Date: 2017-03-06T11:38:36Z
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
commit 756754fcb9ffb43a9f43e17c68055376faa78650
Author: cxfeng <[email protected]>
Date: 2017-03-06T11:40:09Z
Merge branch '0.11-dev' of https://github.com/cxfeng1/incubator-weex into
0.11-dev
commit 21bb2df58ea59c1f789436e482e18e19b7fff020
Author: xkli <[email protected]>
Date: 2017-03-06T11:24:16Z
* [android] update keepscrollto
commit c4eac330eb8361e1e6dd473a4a0a438bf42620b6
Author: xkli <[email protected]>
Date: 2017-03-06T12:13:44Z
* [android] update sticky
commit 33f06ed28d4b5fc33226161511e49d935703c591
Author: xkli <[email protected]>
Date: 2017-03-06T12:24:37Z
* [android] remove redundancy code
commit 7320e4a3e2a6ddd34e92a82b89cebb6a1194f2f7
Author: acton393 <[email protected]>
Date: 2017-03-06T12:32:16Z
* [ios] fix refresh and loading
commit a6ca50c352ffa8549906966aeea75314c2116e3f
Author: acton393 <[email protected]>
Date: 2017-03-06T13:09:26Z
* [ios] fix refresh control load
commit 8c23b93aa39922d5249751a20b980024250bcfc7
Author: sospartan <[email protected]>
Date: 2017-03-07T02:08:29Z
* [android] fix build
commit 281dfad5beccfcbcf2690a58e0f5c0bbb1c95358
Author: sospartan <[email protected]>
Date: 2017-03-07T02:09:10Z
Merge branch '0.11-dev-fix-list-concurrent' of
github.com:sospartan/incubator-weex into 0.11-dev
This closes #40
commit 1d9519c6ab243bff0933b602b498b026eed9699a
Author: sospartan <[email protected]>
Date: 2017-03-07T02:16:07Z
Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex; branch
'android-bugfix-wxembed' of http://github.com/lybeen/incubator-weex into
0.11-dev
This closes #26
commit 6823a132acbc205baa575f4cc0c704df9209086f
Author: sospartan <[email protected]>
Date: 2017-03-07T02:17:20Z
Merge branch '0.11-dev-fix-pos-fixed' of
github.com:sospartan/incubator-weex into 0.11-dev
This closes #33
commit e4e6355ba6b862799f30e4feba7247a189acc85f
Author: sospartan <[email protected]>
Date: 2017-03-07T02:19:22Z
Merge branch '0.11-dev-fix-getdomojb-nullable' of
github.com:sospartan/incubator-weex into 0.11-dev
This closes #37
commit 9c6a4a401dcd1d08435ec3a4c372c74b67f10a2b
Author: éé£ <[email protected]>
Date: 2017-03-07T02:59:26Z
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-dev
commit 95873da2ea520d4b491131b81883e637e701aec8
Author: éé£ <[email protected]>
Date: 2017-03-07T03:21:40Z
* [ios] support loadmore event in recycler
commit 95c7470f269ec82a4ae44d5a291672b565fcfa9b
Author: sospartan <[email protected]>
Date: 2017-03-07T03:35:30Z
* [android] fix loadmoreoffset value in scroller
commit 5ae07d64850e86db8a2181e4f7cf0284604acdae
Author: acton393 <[email protected]>
Date: 2017-03-07T03:39:46Z
Merge remote-tracking branch 'alibaba/ios-feature-0.10.2' into 0.11-dev
# Conflicts:
# ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
# ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
# ios/sdk/WeexSDK/Sources/Module/WXAnimationModule.m
# ios/sdk/WeexSDK/Sources/Utility/WXUtility.m
commit fa1741e4b457ce26ef8296466a9680eaf09946c5
Author: acton393 <[email protected]>
Date: 2017-03-07T03:45:01Z
Merge remote-tracking branch 'alibaba/ios' into 0.11-dev
commit 0255c35e9602a40dab2b0b783eeffe0bd5721fde
Author: zshshr <[email protected]>
Date: 2017-03-07T06:11:25Z
* [android] add so checkSoIsValid
commit f92b6d64f223a1863d7c6b905c9bd6641a006895
Author: éé£ <[email protected]>
Date: 2017-03-07T06:18:54Z
* [ios] remove unused exception handler
commit a4fce670a83f445fae0106ee05252255b834bad5
Author: sospartan <[email protected]>
Date: 2017-03-07T06:19:59Z
* [android] deprecate loadmoreretry attribute
commit b700a6fbeff6f7f00e71e7c858414ba3138c3200
Author: cxfeng <[email protected]>
Date: 2017-03-07T06:20:48Z
Merge branch '0.11-dev' of https://github.com/acton393/incubator-weex into
0.11-dev
commit 2895fe0ffd0c5791c425891b7b4786f0868a24a1
Author: cxfeng <[email protected]>
Date: 2017-03-07T06:21:06Z
Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
commit acaf30d91954a3bc956ad080ffe4e8a6869b487f
Author: sospartan <[email protected]>
Date: 2017-03-07T06:28:21Z
Merge branch '0.11-dev-checkSoIsValid' of
http://github.com/zshshr/incubator-weex into 0.11-dev
This closes #52
commit 1da458e38ce2fbf8ea95de4e6dc7e658f59d51f2
Author: sospartan <[email protected]>
Date: 2017-03-07T06:29:07Z
Merge branch '0.11-dev-fix-list-scroller-loadmore-reset' of
github.com:sospartan/incubator-weex into 0.11-dev
This closes #51
commit 7b9016ce8a9eeb665e5f331a120f70f4de84c8fb
Author: éé£ <[email protected]>
Date: 2017-03-07T07:17:14Z
* [ios] fix crash : numberOfSections will return 1 while datasource is nil,
thus cause performBatchedUpdates crash
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
