Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 103 commits into from
Nov 14, 2016
Merged

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

merged 103 commits into from
Nov 14, 2016

Conversation

Hanks10100
Copy link
Member

No description provided.

acton393 and others added 30 commits August 5, 2016 11:31
@acton393
ci
6ed7df1
@acton393
update hello.we
990d30e
@acton393
update podfile path
2d3c27c
@acton393
update workspace
f656211
@acton393
update xcode_sdk
7ae9cf5
@acton393
update xcode_sdk
e1e37ab
@acton393
Merge pull request #1 from alibaba/dev
8cffb03 
weex update
@acton393
Merge pull request #2 from alibaba/dev
9929265 
update Weex
@Hanks10100
* [jsfm] improve the coverage of api methods test
0f3ac18
@Hanks10100
* [jsfm] add register module test cases
8230329
@Hanks10100
* [jsfm] add invalid version check in downgrade
79c807d
@Hanks10100
+ [jsfm] add test case for App.prototype methods
6145696
@Hanks10100
* [jsfm] add test case for updateActions
d027667
@atomtong
Merge pull request alibaba#1448 from Hanks10100/html5-feature-0.5
296b525 
[jsfm] Merge `html5-feature-0.5` into `jsfm-feature-0.17`
@acton393
Merge pull request #3 from alibaba/dev
cc0e9ea 
update Weex from dev
@Hanks10100
* [jsfm] add test case for shared methods
6836d72
@fkysly
+ [jsfm] add some test for runtime
f843407
@fkysly
Merge branch 'jsfm-feature-0.17' of https://github.com/alibaba/weex i…
67bc33d 
…nto jsfm-feature-0.17
@fkysly
* [jsfm] fix eslint
c0db180
@fkysly
Merge pull request alibaba#1433 from Hanks10100/jsfm-feature-test-cover
cf175cd 
[jsfm] Improve the test coverage for app instance
@Hanks10100
+ [jsfm] add handler.js to generate callNative task handler
177052d
@Hanks10100
* [jsfm] separate the operation of the dispatch task into a function
0c2bac1
@Hanks10100
* [jsfm] add default parameter for createAction
495ac45
@Hanks10100
* [jsfm] add all top level API for dom operation
1755275
@Hanks10100
* [jsfm] adds validation when binding events
907b38f
@Hanks10100
* [jsfm] move docMap into a sole file
29eb91a
@Hanks10100
* [jsfm] move common methods into operation.js
f5e31e4
@Hanks10100
* [jsfm] split vdom.js into different files
248ccc6
@Hanks10100
* [jsfm] move element operation methods to operation.js
92d7683
@fkysly
+ [jsfm] add legacy test
e03b498
Hanks10100 and others added 22 commits November 2, 2016 12:29
@Hanks10100
* [jsfm] modify the rollup build script
c170c47
@Hanks10100
- [jsfm] no need to freeze Math.prototype
65f21ba
@cxfeng1
Merge pull request alibaba#1550 from acton393/dev
3150e3d 
*[ios] fix refresh location
@fkysly
+ [jsfm] fix alibaba#969, support define methods for kind of native c…
b8e54eb 
…omponent
@fkysly
* [jsfm] v0.16.18
308dd5b
@fkysly
Merge branch into jsfm-feature-0.16
6ba2117
@Hanks10100
Merge pull request alibaba#1578 from fkysly/jsfm-feature-0.16
03a0fbb 
+ [jsfm] v0.16.18 fix alibaba#969, support define methods for kind of native component
@fkysly
* [jsfm] add node test case
04fe1b6
@fkysly
Merge pull request alibaba#1582 from fkysly/jsfm-feature-0.17
05527dc 
* [jsfm] add node test case
@dickeylth
bugfix for config
290550d 
bugfix for config, need to be a json.
@Jinjiang
Merge pull request alibaba#1592 from dickeylth/patch-4
91cdeca 
bugfix for config
@Jinjiang
* [jsfm] Bump vue version.
4563b62
@Jinjiang
Merge pull request alibaba#1560 from Hanks10100/jsfm-feature-fix-rollup
f7447e3 
[jsfm] Fix the rollup tree shaking accuracy
@Rowandjj @sospartan
bug fix. retrieve sqliteDatabase fails. (alibaba#1600)
32def33 
* bug fix. retrieve sqliteDatabase fails.

* reuse WXThread#secure instead of make a new one

* update

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

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

@Hanks10100 Hanks10100 mentioned this pull request Nov 14, 2016
Merged
@MrRaindrop MrRaindrop merged commit 2063647 into alibaba:html5-feature-0.5 Nov 14, 2016
@Hanks10100 Hanks10100 deleted the html5-hotfix-conflict branch February 20, 2017 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Jinjiang Jinjiang

@MrRaindrop MrRaindrop

Labels
html5
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@Hanks10100 @Jinjiang @MrRaindrop @acton393 @atomtong @fkysly @cxfeng1 @dickeylth @Rowandjj