Skip to content

Commit

Permalink
0.62.2
Browse files Browse the repository at this point in the history
This closes #94
  • Loading branch information
coni2k authored Jul 11, 2016
1 parent 9e032e2 commit 4941b53
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 57 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
### Changelog

**0.62.2**

* breeze.angular dependency is missing after new project setup
https://github.com/forCrowd/WealthEconomy/issues/94
* Some obsolete blocks were removed

**0.62.1**

* gulp doesn't display typescript error messages
Expand Down
2 changes: 1 addition & 1 deletion SolutionItems/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
//
// AssemblyFileVersion is not in use for the moment
//
[assembly: AssemblyVersion("0.62.1")]
[assembly: AssemblyVersion("0.62.2")]
[assembly: AssemblyFileVersion("1.0.0.0")]
19 changes: 1 addition & 18 deletions ngClient/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ var concat = require('gulp-concat'),
fs = require('fs'),
gulp = require('gulp'),
gutil = require('gutil'),
jshint = require('gulp-jshint'), // Obsolete?
rename = require('gulp-rename'),
sourcemaps = require('gulp-sourcemaps'),
typescript = require("gulp-typescript"),
Expand Down Expand Up @@ -91,7 +90,7 @@ var fontsSrc = [
// default
gulp.task('default', [appJs, appCss, appSettingsJs, libJs, libCss, 'watch']);

// app.js: jshhint + concat all into app.js + minify all into app.min.js
// app.js: convert and bundle ts files into app.js + minify into app.min.js
gulp.task(appJs, function () {

var project = typescript.createProject(appJsConfig, { outFile: appJs });
Expand All @@ -107,22 +106,6 @@ gulp.task(appJs, function () {
.pipe(gulp.dest(appJsRoot));
});

// Old app.js, before typescript - Obsolete
//// app.js: jshhint + concat all into app.js + minify all into app.min.js
//gulp.task(appJs, function () {
// return gulp.src(appJsSrc)
// .pipe(jshint())
// .pipe(jshint.reporter('jshint-stylish'))
// .pipe(sourcemaps.init())
// .pipe(concat(appJs, { newLine: '\r\n' }))
// .pipe(gulp.dest(appJsRoot))
// .pipe(rename(appMinJs))
// .pipe(uglify())
// .on('error', errorHandler)
// .pipe(sourcemaps.write('./', { sourceRoot: appJsSourceMapRoot }))
// .pipe(gulp.dest(appJsRoot));
//});

// app.css: concat all into app.css + minify all into app.min.css
gulp.task(appCss, function () {

Expand Down
70 changes: 32 additions & 38 deletions ngClient/package.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,38 @@
{
"version": "0.0.0",
"name": "ASP.NET",
"version": "0.1.0",
"name": "forcrowd-wealtheconomy-ngclient",
"private": true,
"devDependencies": {
"brace-expansion": "^1.1.5",
"fs": "^0.0.2",
"gulp": "^3.9.1",
"gulp-clean": "^0.3.1",
"gulp-concat": "^2.6.0",
"gulp-cssmin": "^0.1.7",
"gulp-jshint": "^2.0.0",
"gulp-rename": "^1.2.2",
"gulp-sourcemaps": "^1.6.0",
"gulp-tap": "^0.1.3",
"gulp-typescript": "^2.13.6",
"gulp-uglify": "^1.5.3",
"gutil": "^1.6.4",
"jshint": "^2.9.2",
"jshint-stylish": "^2.1.0",
"typescript": "^1.8.10",
"fs": "0.0.2",
"gulp": "3.9.1",
"gulp-concat": "2.6.0",
"gulp-cssmin": "0.1.7",
"gulp-rename": "1.2.2",
"gulp-sourcemaps": "1.6.0",
"gulp-typescript": "2.13.6",
"gulp-uglify": "1.5.3",
"gutil": "1.6.4",
"typescript": "1.8.10",

"angular": "^1.5.0",
"angular-ui-bootstrap": "^1.2.1",
"angular-google-analytics": "^1.1.6",
"angular-mocks": "^1.5.0",
"angular-moment": "^1.0.0-beta.6",
"angular-route": "^1.5.0",
"angular-sanitize": "^1.5.0",
"angular-utils-disqus": "^1.0.0",
"bootstrap": "^3.3.6",
"breeze-client": "^1.5.7",
"breeze-client-labs": "^1.5.8",
"datajs": "^1.0.3",
"font-awesome": "^4.5.0",
"highcharts": "^4.2.3",
"highcharts-ng": "^0.0.11",
"jquery": "^2.2.2",
"moment": "^2.12.0",
"respond.js": "^1.4.2",
"source-map": "^0.5.2",
"toastr": "^2.1.2"
"angular": "1.5.0",
"angular-ui-bootstrap": "1.2.1",
"angular-google-analytics": "1.1.6",
"angular-mocks": "1.5.0",
"angular-moment": "1.0.0-beta.6",
"angular-route": "1.5.0",
"angular-sanitize": "1.5.0",
"angular-utils-disqus": "1.0.1",
"bootstrap": "3.3.6",
"breeze-client": "1.5.7",
"breeze-client-labs": "1.5.8",
"datajs": "1.0.3",
"font-awesome": "4.5.0",
"highcharts": "4.2.3",
"highcharts-ng": "0.0.11",
"jquery": "2.2.2",
"moment": "2.12.0",
"respond.js": "1.4.2",
"source-map": "0.5.2",
"toastr": "2.1.2"
}
}

0 comments on commit 4941b53

Please sign in to comment.