You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by da...@apache.org on 2017/04/05 06:59:00 UTC

[1/2] incubator-weex git commit: * [jsfm] update vue framework to 2.2.2-weex.1

Repository: incubator-weex
Updated Branches:
  refs/heads/0.12-dev fa57ad470 -> da9701c05


* [jsfm] update vue framework to 2.2.2-weex.1


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b4f13645
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b4f13645
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b4f13645

Branch: refs/heads/0.12-dev
Commit: b4f13645fc6408402638137bcb7fc326c878f709
Parents: d240048
Author: fkysly <fk...@gmail.com>
Authored: Wed Apr 5 14:51:45 2017 +0800
Committer: fkysly <fk...@gmail.com>
Committed: Wed Apr 5 14:51:45 2017 +0800

----------------------------------------------------------------------
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b4f13645/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 2bb4c7a..0fe778f 100644
--- a/package.json
+++ b/package.json
@@ -94,7 +94,7 @@
     "semver": "^5.1.0",
     "weex-picker": "^0.1.0",
     "weex-rax-framework": "0.1.0",
-    "weex-vue-framework": "2.2.1-weex.1",
+    "weex-vue-framework": "2.2.2-weex.1",
     "weex-styler": "0.1.9"
   },
   "devDependencies": {


[2/2] incubator-weex git commit: Merge branch '0.12-dev' of https://github.com/fkysly/incubator-weex into 0.12-dev

Posted by da...@apache.org.
Merge branch '0.12-dev' of https://github.com/fkysly/incubator-weex into 0.12-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/da9701c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/da9701c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/da9701c0

Branch: refs/heads/0.12-dev
Commit: da9701c0575d239384c8b1608a1bbef3ef4a6a2e
Parents: fa57ad4 b4f1364
Author: MrRaindrop <te...@gmail.com>
Authored: Wed Apr 5 14:58:32 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Wed Apr 5 14:58:32 2017 +0800

----------------------------------------------------------------------
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/da9701c0/package.json
----------------------------------------------------------------------
diff --cc package.json
index c045ffb,0fe778f..fa29d85
--- a/package.json
+++ b/package.json
@@@ -93,8 -93,8 +93,8 @@@
      "scroll-to": "0.0.2",
      "semver": "^5.1.0",
      "weex-picker": "^0.1.0",
 -    "weex-rax-framework": "0.1.0",
 +    "weex-rax-framework": "0.2.11",
-     "weex-vue-framework": "2.2.1-weex.1",
+     "weex-vue-framework": "2.2.2-weex.1",
      "weex-styler": "0.1.9"
    },
    "devDependencies": {