Ignore res-min folder #553
Closed
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
Conflicts: public/cache.manifest public/res-min/img/button.svg public/res-min/img/icons.png public/res-min/img/icons2x.png public/res-min/img/menu.png public/res-min/main.js public/res-min/themes/base.css public/res-min/themes/blue.css public/res-min/themes/default.css public/res-min/themes/gray.css public/res-min/themes/night.css public/res-min/themes/school.css
For some reason, http:https://github.com/RobinThrift/gulp-requirejs is gone (404), but if you use http:https://github.com/bornkiller/gulp-requirejs then it works. This fixes issue benweet#596"
Conflicts: public/cache.manifest public/res-min/font/fontello.woff public/res-min/main.js public/res-min/themes/base.css public/res-min/themes/blue.css public/res-min/themes/default.css public/res-min/themes/gray.css public/res-min/themes/night.css public/res-min/themes/school.css
Old task depended on an existing cache.manifest file was present, and would be updated. Now we use a gulp plugin which generates the manifest file. NOTE: For now, the mathjax injection is gone, but can be readded if needed at some point. Conflicts: Gulpfile.js package.json
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.
Ignore the built folder with minified files: 'res-min'. This fixes issue #543