Skip to content
This repository has been archived by the owner on Dec 30, 2018. It is now read-only.

Commit

Permalink
Merge pull request #25 from vesparny/1.1.0
Browse files Browse the repository at this point in the history
1.1.0
  • Loading branch information
vesparny committed May 8, 2015
2 parents 0b6b7eb + 3e86a9d commit 97937f8
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 41 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# 1.1.0 (2015-08-05)

### Bug fixes

* updating dependencies

# 1.0.4 (2015-19-01)

### Bug fixes
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ angular-kickstart is an opinionated kickstart for single page application develo

### Getting started

Install **node.js**. Then **sass**, **gulp** and **bower** if you haven't yet.
Install **node.js**. Then **gulp** and **bower** if you haven't yet.

$ gem install sass
$ npm -g install gulp bower

After that, install angular-kickstart downloading the [latest release](https://github.com/vesparny/angular-kickstart/releases) (or clone the master branch if you want to run the development version). Unzip the project and cd into it, then install bower and npm dependencies, and run the application in development mode.
Expand Down
5 changes: 2 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "angular-kickstart",
"version": "1.0.0",
"dependencies": {
"normalize-css": "~3.0.2",
"normalize-css": "~3.0.3",
"angular": "~1.3.0",
"angular-ui-router": "~0.2.11",
"angular-ui-router": "~0.2.14",
"pure": "~0.5.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@
.config(config)
.run(run)
.controller('MainCtrl', MainCtrl)
.value('version', '1.0.4');
.value('version', '1.1.0');
})();
6 changes: 2 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,8 @@ gulp.task('templates', function() {
//generate css files from scss sources
gulp.task('sass', function() {
return gulp.src(config.mainScss)
.pipe($.rubySass())
.on('error', function(err) {
console.log(err.message);
})
.pipe($.sass())
.on('error', $.sass.logError)
.pipe(gulp.dest(config.tmp))
.pipe($.size({
title: 'sass'
Expand Down
62 changes: 31 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "angular-kickstart",
"email": "alessandro@arnodo.net",
"url": "http://alessandro.arnodo.net",
"version": "1.0.4",
"version": "1.1.0",
"homepage": "https://github.com/vesparny/angular-kickstart",
"description": "Speed up your AngularJS development whith a great build system.",
"license": "MIT",
Expand All @@ -13,40 +13,40 @@
"url": "git@github.com:vesparny/angular-kickstart.git"
},
"devDependencies": {
"browser-sync": "~1.1.2",
"del": "~0.1.3",
"gulp": "~3.8.9",
"gulp-changed": "~1.0.0",
"gulp-concat": "~2.4.1",
"gulp-csso": "~0.2.9",
"browser-sync": "~2.7.1",
"del": "~1.1.1",
"gulp": "~3.8.11",
"gulp-changed": "~1.2.1",
"gulp-concat": "~2.5.2",
"gulp-csso": "~1.0.0",
"gulp-header": "~1.2.2",
"gulp-html2js": "~0.2.0",
"gulp-if": "~1.2.5",
"gulp-imagemin": "~2.1.0",
"gulp-jshint": "~1.8.5",
"gulp-load-plugins": "~0.8.0",
"gulp-minify-html": "~0.1.6",
"gulp-ng-annotate": "~0.4.4",
"gulp-ng-html2js": "~0.1.8",
"gulp-protractor": "0.0.12",
"gulp-rev": "~2.0.1",
"gulp-rev-replace": "~0.3.1",
"gulp-ruby-sass": "~0.7.1",
"gulp-size": "~1.1.0",
"gulp-sourcemaps": "~1.2.4",
"gulp-uglify": "~1.0.1",
"gulp-useref": "~1.0.2",
"jshint-stylish": "~1.0.0",
"karma": "~0.12.24",
"karma-chrome-launcher": "~0.1.5",
"karma-coverage": "~0.2.6",
"karma-html-reporter": "~0.2.4",
"karma-jasmine": "~0.3.4",
"karma-mocha-reporter": "~0.3.1",
"gulp-imagemin": "~2.2.1",
"gulp-jshint": "~1.10.0",
"gulp-load-plugins": "~0.10.0",
"gulp-minify-html": "~1.0.2",
"gulp-ng-annotate": "~0.5.3",
"gulp-ng-html2js": "~0.2.0",
"gulp-protractor": "1.0.0",
"gulp-rev": "~3.0.1",
"gulp-rev-replace": "~0.4.0",
"gulp-sass": "~2.0.0",
"gulp-size": "~1.2.1",
"gulp-sourcemaps": "~1.5.2",
"gulp-uglify": "~1.2.0",
"gulp-useref": "~1.1.2",
"jshint-stylish": "~1.0.2",
"karma": "~0.12.31",
"karma-chrome-launcher": "~0.1.8",
"karma-coverage": "~0.3.1",
"karma-html-reporter": "~0.2.6",
"karma-jasmine": "~0.3.5",
"karma-mocha-reporter": "~1.0.2",
"karma-phantomjs-launcher": "~0.1.4",
"lodash": "~2.4.1",
"protractor": "~1.6.1",
"run-sequence": "~1.0.1"
"lodash": "~3.8.0",
"protractor": "~2.0.0",
"run-sequence": "~1.1.0"
},
"engines": {
"node": ">=0.10.x"
Expand Down

0 comments on commit 97937f8

Please sign in to comment.