Skip to content

Port updates from master #1043

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

Merged
merged 7 commits into from
Jul 8, 2015
Merged

Port updates from master #1043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
163249f
Update mongoose/connect-mongo to latest to deploy on Heroku
yoshiokatsuneo Jun 24, 2015
09d6a03
Merge pull request #1017 from yoshiokatsuneo/master
Awk34 Jun 24, 2015
3a63454
Fix Grunfile.js ngAnnotate task src
antoinepairet Jun 30, 2015
a30efa9
Merge pull request #1031 from antoinepairet/patch-2
Awk34 Jul 1, 2015
f8f32f4
feat(readme): add david-dm badge & move badges to new line
Awk34 Jul 7, 2015
93c295c
chore(gen): port updates from master
kingcody Jul 8, 2015
2233ee9
chore(gen): simplify package.json templating
kingcody Jul 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/templates/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ module.exports = function (grunt) {
files: [{
expand: true,
cwd: '.tmp/concat',
src: '*/**.js',
src: '**/*.js',
dest: '.tmp/concat'
}]
}
Expand Down
14 changes: 7 additions & 7 deletions app/templates/_package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@
"morgan": "~1.0.0",
"body-parser": "~1.5.0",
"method-override": "~1.0.0",
"serve-favicon": "~2.0.1",
"cookie-parser": "~1.0.1",
"express-session": "~1.0.2",
"errorhandler": "~1.0.0",
"compression": "~1.0.1",
"composable-middleware": "^0.3.0",
"lodash": "~2.4.1",<% if(filters.babel) { %>
"babel-core": "^5.6.4",<% } %><% if (filters.jade) { %>
"jade": "~1.2.0",<% } %><% if (filters.html) { %>
"ejs": "~0.8.4",<% } %><% if (filters.mongoose) { %>
"mongoose": "~3.8.8",
"mongoose-bird": "~0.0.1",<% } %><% if (filters.sequelize) { %>
"mongoose": "~4.0.3",
"mongoose-bird": "~0.0.1",
"connect-mongo": "^0.8.1",<% } %><% if (filters.sequelize) { %>
"sequelize": "^2.0.0-rc2",
"sqlite3": "~3.0.2",<% } %><% if (filters.auth) { %>
"jsonwebtoken": "^5.0.0",
Expand All @@ -26,12 +27,11 @@
"passport-local": "~0.1.6",<% } %><% if (filters.facebookAuth) { %>
"passport-facebook": "latest",<% } %><% if (filters.twitterAuth) { %>
"passport-twitter": "latest",<% } %><% if (filters.googleAuth) { %>
"passport-google-oauth": "latest",<% } %>
"composable-middleware": "^0.3.0"<% if (filters.mongoose) { %>,
"connect-mongo": "^0.4.1"<% } %><% if (filters.socketio) { %>,
"passport-google-oauth": "latest",<% } %><% if (filters.socketio) { %>
"socket.io": "^1.0.6",
"socket.io-client": "^1.0.6",
"socketio-jwt": "^3.0.0"<% } %>
"socketio-jwt": "^3.0.0",<% } %>
"serve-favicon": "~2.0.1"
},
"devDependencies": {
"grunt": "~0.4.4",
Expand Down
3 changes: 2 additions & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# AngularJS Full-Stack generator [![Build Status](https://travis-ci.org/DaftMonk/generator-angular-fullstack.svg?branch=master)](http://travis-ci.org/DaftMonk/generator-angular-fullstack) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/DaftMonk/generator-angular-fullstack)
# AngularJS Full-Stack generator
[![Build Status](https://travis-ci.org/DaftMonk/generator-angular-fullstack.svg?branch=master)](http://travis-ci.org/DaftMonk/generator-angular-fullstack) [![Dependency Status](https://david-dm.org/daftmonk/generator-angular-fullstack.png)](https://david-dm.org/daftmonk/generator-angular-fullstack) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/DaftMonk/generator-angular-fullstack)

> Yeoman generator for creating MEAN stack applications, using MongoDB, Express, AngularJS, and Node - lets you quickly set up a project following best practices.

Expand Down