[html5] Merge dev into html5-feature-0.5 and fix the conflicts #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
weex update
update Weex
[jsfm] Merge `html5-feature-0.5` into `jsfm-feature-0.17`
update Weex from dev
…nto jsfm-feature-0.17
[jsfm] Improve the test coverage for app instance
[jsfm] Modify the code details to adapt Object.freeze on iOS.
*[ios] fix refresh location
+ [jsfm] v0.16.18 fix alibaba#969, support define methods for kind of native component
* [jsfm] add node test case
bugfix for config, need to be a json.
bugfix for config
[jsfm] Fix the rollup tree shaking accuracy
* bug fix. retrieve sqliteDatabase fails. * reuse WXThread#secure instead of make a new one * update * re create table if not exists
[jsfm] Bump vue version
Fix the regular expression of commit message
[jsfm] Mock the 'global' variable for js bundle
[jsfm] Merge js framework 0.17 into dev
Hanks10100
pushed a commit
that referenced
this pull request
Mar 17, 2017
…into 0.11-dev This close #7
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.