-
Notifications
You must be signed in to change notification settings - Fork 6
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
Pr/38 #40
Open
matthova
wants to merge
36
commits into
master
Choose a base branch
from
pr/38
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Pr/38 #40
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
8dc53b3
yo webapp
mabuelhagag 8aef9f3
.nvmrc file
mabuelhagag 0852f55
change jquery and bootstrap-sass versions
mabuelhagag 3656bbc
change to boostrap 4.0.0-alpha.2
mabuelhagag 672314a
remove old bootstrap pulgins files
mabuelhagag d342026
relative symbolic link to STLs folder
mabuelhagag 967214e
bower install --save threejs#r73
mabuelhagag fe6ca06
bower install --save jquery-ui#1.11.4
mabuelhagag 6ae976e
bower install --save zip-js#1.0.0
mabuelhagag 80dbd42
threejs js files
mabuelhagag e5f175e
remove main.js
mabuelhagag 716453b
migrate webapp's js files
mabuelhagag 68afd1d
migrate html contents
mabuelhagag c459518
copy fonts
mabuelhagag ca28359
migrate scss files
mabuelhagag 555b23f
jqueryui js dependencies
mabuelhagag 4f3400f
copy images
mabuelhagag d19a802
copy designs
mabuelhagag 3c7f4d3
zip-js z-worker and deflate files
mabuelhagag 5752e54
fix three.js path
mabuelhagag 0b2d9a0
move designs.json
mabuelhagag 66b3e92
bower install --save underscore#1.8.3
mabuelhagag d854f8e
fix STLs symbolic link
mabuelhagag bccde3f
js linting
mabuelhagag b90c9dd
fix zip-js custom location
mabuelhagag 1d51461
disable babel support
mabuelhagag 9bd6dc2
remove all old files except STLs, README.md and LICENSE.md
mabuelhagag 55dfa19
remove old .gitignore file
mabuelhagag 9bea6ff
move yeoman project to root
mabuelhagag 623b119
remove STLs symlink and move STLs folder into app folder
mabuelhagag 314c9bc
copy STLs folder in building
mabuelhagag 52d09cc
add tether
mabuelhagag 0dd52e1
gitignore webstorm and sublime text files
mabuelhagag 7287a62
added .DS_Store to .gitignore
matthova 9088b11
updated gitignore and added npm scripts for gulp and bower
matthova 4943bbe
updated readme with dev instructions
matthova File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,12 @@ | |
"engines": { | ||
"node": ">=4" | ||
}, | ||
"scripts": { | ||
"postinstall": "node node_modules/bower/bin/bower install", | ||
"start": "node node_modules/gulp/bin/gulp.js serve", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Then you can replace with just |
||
"build": "node node_modules/gulp/bin/gulp.js build", | ||
"serve": "node node_modules/gulp/bin/gulp.js serve:dist" | ||
}, | ||
"devDependencies": { | ||
"babel-core": "^6.4.0", | ||
"babel-preset-es2015": "^6.3.13", | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bower and gulp-cli needs to be installed globally
npm install -g bower gulp-cli && bower install