[html5] Merge dev into html5-feature-0.5 and fix the conflicts #1635

Merged
merged 103 commits into from Nov 14, 2016

Projects

None yet

9 participants

@Hanks10100
Member

No description provided.

acton393 and others added some commits Aug 5, 2016
@acton393 acton393 ci 6ed7df1
@acton393 acton393 update hello.we 990d30e
@acton393 acton393 update podfile path 2d3c27c
@acton393 acton393 update workspace f656211
@acton393 acton393 update xcode_sdk 7ae9cf5
@acton393 acton393 update xcode_sdk e1e37ab
@acton393 acton393 Merge pull request #1 from alibaba/dev
weex update
8cffb03
@acton393 acton393 Merge pull request #2 from alibaba/dev
update Weex
9929265
@Hanks10100 Hanks10100 * [jsfm] improve the coverage of api methods test 0f3ac18
@Hanks10100 Hanks10100 * [jsfm] add register module test cases 8230329
@Hanks10100 Hanks10100 * [jsfm] add invalid version check in downgrade 79c807d
@Hanks10100 Hanks10100 + [jsfm] add test case for App.prototype methods 6145696
@Hanks10100 Hanks10100 * [jsfm] add test case for updateActions
d027667
@atomtong atomtong Merge pull request #1448 from Hanks10100/html5-feature-0.5
[jsfm] Merge `html5-feature-0.5` into `jsfm-feature-0.17`
296b525
@acton393 acton393 Merge pull request #3 from alibaba/dev
update Weex from dev
cc0e9ea
@Hanks10100 Hanks10100 * [jsfm] add test case for shared methods
6836d72
@fkysly fkysly + [jsfm] add some test for runtime f843407
@fkysly fkysly Merge branch 'jsfm-feature-0.17' of https://github.com/alibaba/weex i…
…nto jsfm-feature-0.17
67bc33d
@fkysly fkysly * [jsfm] fix eslint
c0db180
@fkysly fkysly Merge pull request #1433 from Hanks10100/jsfm-feature-test-cover
[jsfm] Improve the test coverage for app instance
cf175cd
@Hanks10100 Hanks10100 + [jsfm] add handler.js to generate callNative task handler
177052d
@Hanks10100 Hanks10100 * [jsfm] separate the operation of the dispatch task into a function
0c2bac1
@Hanks10100 Hanks10100 * [jsfm] add default parameter for createAction
495ac45
@Hanks10100 Hanks10100 * [jsfm] add all top level API for dom operation
1755275
@Hanks10100 Hanks10100 * [jsfm] adds validation when binding events
907b38f
@Hanks10100 Hanks10100 * [jsfm] move docMap into a sole file
29eb91a
@Hanks10100 Hanks10100 * [jsfm] move common methods into operation.js
f5e31e4
@Hanks10100 Hanks10100 * [jsfm] split vdom.js into different files
248ccc6
@Hanks10100 Hanks10100 * [jsfm] move element operation methods to operation.js
92d7683
@fkysly fkysly + [jsfm] add legacy test e03b498
@Hanks10100 Hanks10100 * [jsfm] fix condition judgment bug in insertBefore & insertAfter
9c182af
@Hanks10100 Hanks10100 * [jsfm] move event handler validation to directive bindEvents 64f8c92
@Hanks10100 Hanks10100 * [jsfm] move extend into operation 047ef99
@Hanks10100 Hanks10100 * [jsfm] use extend() to add prototype methods a66bfdb
@Hanks10100 Hanks10100 * [jsfm] wrap IFFE and use strict mode for js bundle 02c8b16
@Hanks10100 Hanks10100 * [jsfm] add detailed comments for runtime files eee2baf
@Hanks10100 Hanks10100 - [jsfm] remove resetClassStyle api from document prototype b7dcd05
@fkysly fkysly + [jsfm] add test for static
776ee91
@fkysly fkysly * [jsfm] fix format for lint
5faa860
@fkysly fkysly + [jsfm] add vm/compiler test
35745fd
@Hanks10100 Hanks10100 * [jsfm] just warn when bind an invalid event handler
e8205ea
@Hanks10100 Hanks10100 * [jsfm] move browserifyRequire out of the define
e8a2983
@Jinjiang Jinjiang Merge pull request #1468 from Hanks10100/jsfm-feature-bind-check
[jsfm] Add validation when binding events
a34c037
@Jinjiang Jinjiang Merge pull request #1483 from Hanks10100/jsfm-feature-use-strict
[jsfm] Wrap IFFE and use strict mode for js bundle
844b53c
@Hanks10100 Hanks10100 * [jsfm] move shared utils to legacy framework bca5455
@Hanks10100 Hanks10100 Merge pull request #1495 from fkysly/jsfm-feature-0.17
+ [jsfm] add test for legacy/vm
4aece13
@Hanks10100 Hanks10100 * [jsfm] add setNativeConsole and resetNativeConsole API a8f39a5
@Hanks10100 Hanks10100 * [jsfm] add setNativeTimer and resetNativeTimer API c5826ea
@Hanks10100 Hanks10100 + [jsfm] add build script for native & runtime
f1713ad
@Jinjiang Jinjiang Merge pull request #1508 from Hanks10100/jsfm-feature-runtime-refactor
[jsfm] Refactor Weex runtime module
3167f2f
@Jinjiang Jinjiang * [jsfm] bump the Node version in ci config 3a39787
@Hanks10100 Hanks10100 * [jsfm] skip the console test e317ade
@Hanks10100 Hanks10100 * [jsfm] modify the runtime usage in html5 render 2dee94e
@Hanks10100 Hanks10100 + [jsfm] add test case for strict mode 3d77073
@Hanks10100 Hanks10100 * [jsfm] freeze the prototype of build-in objects d60d5ca
@Hanks10100 Hanks10100 * [jsfm] istanbul ignore ployfills d4f5480
@Hanks10100 Hanks10100 Merge branch 'dev' into jsfm-feature-0.17 73f95ec
@Hanks10100 Hanks10100 Merge branch 'jsfm-feature-strict-test' into jsfm-feature-freeze 5a05f88
@Hanks10100 Hanks10100 + [jsfm] add test case for freezePrototype
bb5a04c
@Jinjiang Jinjiang Merge pull request #1529 from Hanks10100/jsfm-feature-freeze
[jsfm] Freeze the prototype of intrenal and build-in objects
b4f9085
@Hanks10100 Hanks10100 * [jsfm] add the missing setTimeout for Android
382cd04
@fkysly fkysly + [jsfm] add test for legacy app/core/static/util
a3d1698
@Hanks10100 Hanks10100 Merge pull request #1532 from fkysly/jsfm-feature-0.17
+ [jsfm] add test for legacy app/core/static/util
1f9cbbc
@Hanks10100 Hanks10100 * [jsfm] use Object.defineProperty to add properties fe1fa1b
@Hanks10100 Hanks10100 * [jsfm] use Object.create to extend prototype c4b83aa
@fkysly fkysly + [jsfm] add unit test
dba83e6
@fkysly fkysly Merge pull request #1547 from fkysly/jsfm-feature-0.17
+ [jsfm] add unit test
3cd4d8f
@fkysly fkysly Merge pull request #1531 from Hanks10100/jsfm-feature-global-timer
[jsfm] Add the missing setTimeout for Android
1a0afbc
@acton393 acton393 Merge pull request #6 from alibaba/dev
dev update
acc1c77
@acton393 acton393 * [ios] 1. fix refresh location 2. cancel playground re-checkupdate 69f43da
@fkysly fkysly + [jsfm] merge examples config file 132a58e
@fkysly fkysly Merge branch 'jsfm-feature-0.17' of https://github.com/alibaba/weex i…
…nto jsfm-feature-0.17
b9a0129
@acton393 acton393 * [ios] remove unused 159ccc4
@acton393 acton393 Revert "update hello.we"
This reverts commit 990d30e.
ba0fb12
@acton393 acton393 * [ios] update playground version
4359b6d
@fkysly fkysly * [jsfm] merge package.json add package.json
b35e1ea
@fkysly fkysly Merge pull request #1549 from fkysly/jsfm-feature-0.17
+ [jsfm] merge examples config file
30b1692
@Hanks10100 Hanks10100 Merge branch 'jsfm-feature-0.17' into jsfm-feature-freeze-fix
85e402f
@Hanks10100 Hanks10100 * [jsfm] remove the 'this' in downgrade 6a88705
@Hanks10100 Hanks10100 * [jsfm] import promise hack before polyfill 35de7bb
@fkysly fkysly Merge pull request #1551 from Hanks10100/jsfm-feature-freeze-fix
[jsfm] Modify the code details to adapt Object.freeze on iOS.
b8ea679
@Hanks10100 Hanks10100 * [jsfm] modify the rollup build script
c170c47
@Hanks10100 Hanks10100 - [jsfm] no need to freeze Math.prototype 65f21ba
@cxfeng1 cxfeng1 Merge pull request #1550 from acton393/dev
*[ios] fix refresh location
3150e3d
@fkysly fkysly + [jsfm] fix #969, support define methods for kind of native component b8e54eb
@fkysly fkysly * [jsfm] v0.16.18 308dd5b
@fkysly fkysly Merge branch into jsfm-feature-0.16
6ba2117
@Hanks10100 Hanks10100 Merge pull request #1578 from fkysly/jsfm-feature-0.16
+ [jsfm] v0.16.18 fix #969, support define methods for kind of native component
03a0fbb
@fkysly fkysly * [jsfm] add node test case
04fe1b6
@fkysly fkysly Merge pull request #1582 from fkysly/jsfm-feature-0.17
* [jsfm] add node test case
05527dc
@dickeylth dickeylth bugfix for config
bugfix for config, need to be a json.
290550d
@Jinjiang Jinjiang Merge pull request #1592 from dickeylth/patch-4
bugfix for config
91cdeca
@Jinjiang Jinjiang * [jsfm] Bump vue version. 4563b62
@Jinjiang Jinjiang Merge pull request #1560 from Hanks10100/jsfm-feature-fix-rollup
[jsfm] Fix the rollup tree shaking accuracy
f7447e3
@Rowandjj @sospartan Rowandjj bug fix. retrieve sqliteDatabase fails. (#1600)
* bug fix. retrieve sqliteDatabase fails.

* reuse WXThread#secure instead of make a new one

* update

* re create table if not exists
32def33
@Hanks10100 Hanks10100 Merge pull request #1603 from Jinjiang/jsfm-feature-0.17
[jsfm] Bump vue version
28294ed
@Hanks10100 Hanks10100 * [all] fix the regex of commit message
5f64099
@Jinjiang Jinjiang Merge pull request #1609 from Hanks10100/dev-hotfix-commit-log
Fix the regular expression of commit message
5a229b6
@Hanks10100 Hanks10100 * [jsfm] make 'global' to be a local variable
4366827
@Hanks10100 Hanks10100 * [jsfm] fix the conflect from jsfm-feature-0.16
77bb89e
@Jinjiang Jinjiang Merge pull request #1626 from Hanks10100/jsfm-feature-mock-global
[jsfm] Mock the 'global' variable for js bundle
e57e2ed
@Jinjiang Jinjiang Merge pull request #1622 from alibaba/jsfm-feature-0.17
[jsfm] Merge js framework 0.17 into dev
6f58f89
@Hanks10100 Hanks10100 * [html5] merge dev into html5 and fix the conflicts
5fd6f54
@Hanks10100
Member

Fix the conflicts in #1556 . It can be squash merge into html5-feature-0.5.

@MrRaindrop MrRaindrop merged commit 2063647 into alibaba:html5-feature-0.5 Nov 14, 2016

2 checks passed

ci/circleci Your tests passed on CircleCI!
Details
licence/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment