You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/04/28 09:17:42 UTC
[1/3] incubator-weex git commit: * [iOS] open a header file
Repository: incubator-weex
Updated Branches:
refs/heads/0.13-dev 3b8700be0 -> 7993205d8
* [iOS] open a header file
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eed974f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eed974f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eed974f2
Branch: refs/heads/0.13-dev
Commit: eed974f2eb9c4898c7de6e361844764a7d4fc10d
Parents: cf755d4
Author: \u6b64\u95f4 <zh...@alibaba-inc.com>
Authored: Wed Apr 26 18:51:48 2017 +0800
Committer: \u6b64\u95f4 <zh...@alibaba-inc.com>
Committed: Wed Apr 26 18:51:48 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/eed974f2/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index d211f5f..0a61a9b 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -30,7 +30,7 @@
2A919DA61E321F1F006EB6B5 /* WXBridgeMethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A919DA41E321F1F006EB6B5 /* WXBridgeMethod.h */; };
2A919DA71E321F1F006EB6B5 /* WXBridgeMethod.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A919DA51E321F1F006EB6B5 /* WXBridgeMethod.m */; };
2AAFC1B61C48DFF70026D2FE /* WXSDKError.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AAFC1B41C48DFF70026D2FE /* WXSDKError.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 2AC750241C7565690041D390 /* WXIndicatorComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC750221C7565690041D390 /* WXIndicatorComponent.h */; };
+ 2AC750241C7565690041D390 /* WXIndicatorComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AC750221C7565690041D390 /* WXIndicatorComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
2AC750251C7565690041D390 /* WXIndicatorComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AC750231C7565690041D390 /* WXIndicatorComponent.m */; };
2AE5B7521CAB7DBD0082FDDB /* WXAComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = 2AE5B7501CAB7DBD0082FDDB /* WXAComponent.h */; settings = {ATTRIBUTES = (Public, ); }; };
2AE5B7531CAB7DBD0082FDDB /* WXAComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = 2AE5B7511CAB7DBD0082FDDB /* WXAComponent.m */; };
[3/3] incubator-weex git commit: Merge branch 'cijian-dev' of
https://github.com/cijianzy/incubator-weex into apache-0.13-dev
Posted by ac...@apache.org.
Merge branch 'cijian-dev' of https://github.com/cijianzy/incubator-weex into apache-0.13-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7993205d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7993205d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7993205d
Branch: refs/heads/0.13-dev
Commit: 7993205d8972215bebf33a505615df5bbd3c35a8
Parents: 3b8700b 1d53ab2
Author: acton393 <zh...@gmail.com>
Authored: Fri Apr 28 17:06:15 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Apr 28 17:06:15 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: Merge commit
'507cd7ca3cc1af696c498b6b570e7cd73cb8ab84' into cijian-dev
Posted by ac...@apache.org.
Merge commit '507cd7ca3cc1af696c498b6b570e7cd73cb8ab84' into cijian-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1d53ab24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1d53ab24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1d53ab24
Branch: refs/heads/0.13-dev
Commit: 1d53ab246112fe03cef8970680431cfbbfd96011
Parents: eed974f 507cd7c
Author: \u6b64\u95f4 <zh...@alibaba-inc.com>
Authored: Wed Apr 26 18:54:26 2017 +0800
Committer: \u6b64\u95f4 <zh...@alibaba-inc.com>
Committed: Wed Apr 26 18:54:26 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 2 +-
android/sdk/assets/main.js | 8 ---
android/sdk/build.gradle | 6 +++
.../com/taobao/weex/dom/TextDecorationSpan.java | 55 ++++++++++++++++++++
.../main/java/com/taobao/weex/dom/WXStyle.java | 32 ++++++++----
.../com/taobao/weex/dom/WXTextDomObject.java | 11 +---
.../weex/ui/component/WXTextDecoration.java | 1 +
dangerfile.js | 1 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 10 ++--
ios/sdk/WeexSDK/Resources/main.js | 8 ---
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 4 +-
pre-build/native-bundle-main.js | 8 +++
13 files changed, 102 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1d53ab24/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------