Skip to content

Merge release in master #643

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.

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

Merged
merged 5 commits into from
Jul 14, 2015
Merged

Conversation

rosen-vladimirov
Copy link
Contributor

Merge latest fixes from release branch in master. The fixes are part of AppBuilder integration with latest {N} version

Add ignoreScripts option, which should be used when during installation of modules you want to skip all scripts declared in package.json's of these modules. When you specify --ignoreScripts, we just add `--ignore-scripts` to npm install command.
During project preparation, we should not delete values directories as they contain specific information, which is important for android builds (strings.xml file for example).
Conflicts:
	lib/services/android-project-service.ts
@rosen-vladimirov rosen-vladimirov self-assigned this Jul 14, 2015
@rosen-vladimirov rosen-vladimirov added this to the 1.2.0 milestone Jul 14, 2015
@ns-bot
Copy link

ns-bot commented Jul 14, 2015

@Mitko-Kerezov
Copy link
Contributor

👍

rosen-vladimirov added a commit that referenced this pull request Jul 14, 2015
@rosen-vladimirov rosen-vladimirov merged commit 4461db3 into master Jul 14, 2015
@rosen-vladimirov rosen-vladimirov deleted the vladimirov/merge-appbuilder-fixes branch July 14, 2015 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants