incubator-weex git commit: Update License
Repository: incubator-weex Updated Branches: refs/heads/release b5bd34625 -> 3cb59d1f7 Update License Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3cb59d1f Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3cb59d1f Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3cb59d1f Branch: refs/heads/release Commit: 3cb59d1f7f55a4f42547f0de4bb484211b3c30e0 Parents: b5bd346 Author: YorkShen Authored: Thu Jul 5 11:53:53 2018 +0800 Committer: YorkShen Committed: Thu Jul 5 11:53:53 2018 +0800 -- LICENSE | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3cb59d1f/LICENSE -- diff --git a/LICENSE b/LICENSE index f75057c..661b0ce 100644 --- a/LICENSE +++ b/LICENSE @@ -219,24 +219,8 @@ This product bundles vuejs v1.0.12, which is available under a runtime/frameworks/legacy/core/state.js runtime/frameworks/legacy/core/watcher.js -This product bundles Guava v20.0, which is available under a "Apache" license. For details, see -For https://github.com/google/guava/blob/v20.0/COPYING and following files: +This product bundles Guava v20.0, which is available under a "Apache" license. For details, see https://github.com/google/guava/blob/v20.0/COPYING and following files: android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java -/* - * Copyright (C) 2007 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ For fpconv weex_core/Source/core/parser/dom_parser.cpp
incubator-weex git commit: * Update Apache License.
Repository: incubator-weex Updated Branches: refs/heads/release 48eb44e85 -> b5bd34625 * Update Apache License. Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b5bd3462 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b5bd3462 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b5bd3462 Branch: refs/heads/release Commit: b5bd346253bd266a8e53957c6ff4499eea30d51c Parents: 48eb44e Author: YorkShen Authored: Thu Jul 5 11:50:35 2018 +0800 Committer: YorkShen Committed: Thu Jul 5 11:50:35 2018 +0800 -- LICENSE | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b5bd3462/LICENSE -- diff --git a/LICENSE b/LICENSE index 899d5c9..f75057c 100644 --- a/LICENSE +++ b/LICENSE @@ -219,8 +219,9 @@ This product bundles vuejs v1.0.12, which is available under a runtime/frameworks/legacy/core/state.js runtime/frameworks/legacy/core/watcher.js -For Guava -android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java +This product bundles Guava v20.0, which is available under a "Apache" license. For details, see +For https://github.com/google/guava/blob/v20.0/COPYING and following files: +android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java /* * Copyright (C) 2007 The Guava Authors *
incubator-weex git commit: * [LICENSE] Change vuejs dependency in LICENSE according to apache rules [1] [2] [1] http://apache.org/dev/licensing-howto.html#permissive-deps [2] https://www.apache.org/le
Repository: incubator-weex Updated Branches: refs/heads/release 857843034 -> 48eb44e85 * [LICENSE] Change vuejs dependency in LICENSE according to apache rules [1] [2] [1] http://apache.org/dev/licensing-howto.html#permissive-deps [2] https://www.apache.org/legal/src-headers.html#3party Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/48eb44e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/48eb44e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/48eb44e8 Branch: refs/heads/release Commit: 48eb44e8560cfc574e875b7ccc64ff3834b5d30c Parents: 8578430 Author: Adam Feng Authored: Thu Jul 5 11:36:25 2018 +0800 Committer: Adam Feng Committed: Thu Jul 5 11:36:25 2018 +0800 -- LICENSE | 48 1 file changed, 16 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/48eb44e8/LICENSE -- diff --git a/LICENSE b/LICENSE index 422d450..899d5c9 100644 --- a/LICENSE +++ b/LICENSE @@ -202,38 +202,22 @@ limitations under the License. -*/ - -For the vuejs components: -runtime/frameworks/legacy/core/array.js -runtime/frameworks/legacy/core/dep.js -runtime/frameworks/legacy/core/object.js -runtime/frameworks/legacy/core/observer.js -runtime/frameworks/legacy/core/state.js -runtime/frameworks/legacy/core/watcher.js -/* -The MIT License (MIT) - -Copyright (c) 2013-2015 Yuxi Evan You - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -*/ +== + +Apache Weex Submodules: + +Apache Weex includes a number of submodules with separate copyright notices +and license terms. Your use of these submodules is subject to the terms and +conditions of the following licenses. + +This product bundles vuejs v1.0.12, which is available under a +"MIT" license. For details, see https://github.com/vuejs/vue/blob/v1.0.12/LICENSE and following files: + runtime/frameworks/legacy/core/array.js + runtime/frameworks/legacy/core/dep.js + runtime/frameworks/legacy/core/object.js + runtime/frameworks/legacy/core/observer.js + runtime/frameworks/legacy/core/state.js + runtime/frameworks/legacy/core/watcher.js For Guava android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java
[GitHub] incubator-weex pull request #1301: [WEEX-485][Android] fix slider bug: scrol...
Github user luckybilly closed the pull request at: https://github.com/apache/incubator-weex/pull/1301 ---
[GitHub] incubator-weex issue #1301: [WEEX-485][Android] fix slider bug: scroll when ...
Github user luckybilly commented on the issue: https://github.com/apache/incubator-weex/pull/1301 PR has been merged, but the status is not updated... Is it a github bug? ---
[GitHub] incubator-weex pull request #1302: [WEEX-487][Android] bug fix: scrollable="...
Github user luckybilly closed the pull request at: https://github.com/apache/incubator-weex/pull/1302 ---
[GitHub] incubator-weex issue #1302: [WEEX-487][Android] bug fix: scrollable="false" ...
Github user luckybilly commented on the issue: https://github.com/apache/incubator-weex/pull/1302 PR has been merged, but the status is not updated... Is it a github bug? ---
incubator-weex git commit: [WEEX-485][Android] fix slider bug: scroll when scrollable=false make index not work
Repository: incubator-weex
Updated Branches:
refs/heads/master 35fd2057a -> 8ce1f1ee8
[WEEX-485][Android] fix slider bug: scroll when scrollable=false make index not
work
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8ce1f1ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8ce1f1ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8ce1f1ee
Branch: refs/heads/master
Commit: 8ce1f1ee80d263d65fda91b8b5f54cdecc3ab01c
Parents: 35fd205
Author: qiyi
Authored: Fri Jun 29 11:23:25 2018 +0800
Committer: YorkShen
Committed: Wed Jul 4 21:50:27 2018 +0800
--
.../main/java/com/taobao/weex/ui/view/WXCircleViewPager.java| 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8ce1f1ee/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
index f44f59a..4b51474 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXCircleViewPager.java
@@ -139,6 +139,11 @@ public class WXCircleViewPager extends ViewPager
implements WXGestureObservable
}
@Override
+ public boolean onInterceptTouchEvent(MotionEvent ev) {
+return scrollable && super.onInterceptTouchEvent(ev);
+ }
+
+ @Override
public boolean onTouchEvent(MotionEvent ev) {
if(!scrollable) {
return true;
incubator-weex git commit: [WEEX-487][Android] bug fix: scrollable="false" not work on android
Repository: incubator-weex
Updated Branches:
refs/heads/master c354d2bbc -> 35fd2057a
[WEEX-487][Android] bug fix: scrollable="false" not work on android
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/35fd2057
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/35fd2057
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/35fd2057
Branch: refs/heads/master
Commit: 35fd2057af59c4c117c5a41407f36512054564f8
Parents: c354d2b
Author: qiyi
Authored: Fri Jun 29 11:48:39 2018 +0800
Committer: YorkShen
Committed: Wed Jul 4 21:43:17 2018 +0800
--
.../sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/35fd2057/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
index a31b56c..196c839 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSlider.java
@@ -400,9 +400,7 @@ public class WXSlider extends WXVContainer {
@WXComponentProp(name = Constants.Name.SCROLLABLE)
public void setScrollable(boolean scrollable) {
if (mViewPager != null && mAdapter != null) {
- if(mAdapter.getRealCount() > 0){
-mViewPager.setScrollable(scrollable);
- }
+ mViewPager.setScrollable(scrollable);
}
}
[GitHub] incubator-weex issue #1310: [WEEX-490][android] fix the bug of input compone...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1310 Messages :book: has no jsfm file changed. :book: jsfm test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #1310: [WEEX-490][android] fix the bug of input ...
GitHub user yangchendev opened a pull request: https://github.com/apache/incubator-weex/pull/1310 [WEEX-490][android] fix the bug of input component when setting prope⦠â¦rty "type=tel" and "type=number" in input componentï¼users can also input text Bug: 490 You can merge this pull request into a Git repository by running: $ git pull https://github.com/yangchendev/incubator-weex release-0.19-bugfix-input Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1310.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 #1310 ---
[GitHub] incubator-weex issue #1309: [WEEX-492][iOS] Make stoppropagation parameter c...
Github user weex-bot commented on the issue: https://github.com/apache/incubator-weex/pull/1309 Warnings :warning: No Changelog changes! Messages :book: danger test finished. Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS ---
[GitHub] incubator-weex pull request #1309: [WEEX-492][iOS] Make stoppropagation para...
GitHub user doumafang opened a pull request: https://github.com/apache/incubator-weex/pull/1309 [WEEX-492][iOS] Make stoppropagation parameter compatible with Rax framework When using Rax with stoppropagation parameter, you may find it is useless. First of all, it is Rax'bug and weex make it compatible with Rax Framework. You can merge this pull request into a Git repository by running: $ git pull https://github.com/doumafang/incubator-weex master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-weex/pull/1309.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 #1309 commit 624e1c0555b95ae0474407f97877ca5397da9585 Author: doumafang Date: 2018-07-04T08:08:23Z [WEEX-492][iOS] Make stoppropagation parameter compatible with Rax framework. ---
