Skip to content

Commit e8f29bf

Browse files
committed
chore(build) Keep numbering in step with forms-angular
1 parent 7c9cbd6 commit e8f29bf

File tree

5 files changed

+25
-22
lines changed

5 files changed

+25
-22
lines changed

bower.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fng-reports",
3-
"version": "0.4.1",
3+
"version": "0.5.0",
44
"author": "Mark Chapman <support@forms-angular.org>",
55
"description": "Angular UI reporting plugin for forms-angular",
66
"main": [
@@ -14,14 +14,11 @@
1414
"dependencies": {
1515
"jquery": ">=1.8",
1616
"ng-grid": "2.0.7",
17-
"jspdf": ">=1.0.178"
17+
"jspdf": "1.0.272"
1818
},
1919
"devDependencies": {
20-
"angular": "1.3.0",
21-
"angular-sanitize": "1.3.0",
22-
"angular-mocks": "1.3.0",
23-
"forms-angular": "0.4.0",
24-
"angular-ui-bootstrap-bower": ">=0.8.0"
20+
"angular-mocks": "~1.3",
21+
"forms-angular": "^0.5.1"
2522
},
2623
"ignore": [
2724
"**/.*",

dist/fng-reports.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! forms-angular 2015-03-13 */
1+
/*! forms-angular 2015-10-15 */
22
'use strict';
33

44
formsAngular.controller('AnalysisCtrl', ['$filter', '$scope', '$http', '$location', 'cssFrameworkService', 'routingService',

dist/fng-reports.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fng-reports",
3-
"version": "0.4.1",
4-
"private":"true",
3+
"version": "0.5.0",
4+
"private": "true",
55
"description": "Reporting plugin for forms-angular",
66
"repository": {
77
"type": "git",
@@ -16,7 +16,7 @@
1616
"url": "https://github.com/forms-angular/fng-reports/issues"
1717
},
1818
"peerDependencies": {
19-
"forms-angular": "0.4.1"
19+
"forms-angular": "^0.5.0"
2020
},
2121
"devDependencies": {
2222
"grunt": "~0.4.5",
@@ -34,7 +34,12 @@
3434
"grunt-ng-annotate": "*",
3535
"grunt-rev": "~0.1.0",
3636
"grunt-usemin": "^2.1.0",
37+
"jasmine-core": "^2.3.4",
3738
"karma": "^0.12.17",
38-
"matchdep": "~0.3"
39+
"karma-jasmine": "^0.3.6",
40+
"karma-junit-reporter": "^0.3.7",
41+
"karma-phantomjs-launcher": "^0.2.1",
42+
"matchdep": "~0.3",
43+
"phantomjs": "^1.9.18"
3944
}
4045
}

test/karma.conf.js

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ module.exports = function(config) {
33
basePath: '../',
44
frameworks: ['jasmine'],
55
files: [
6-
"bower_components/angular/angular.js",
7-
"bower_components/angular-sanitize/angular-sanitize.js",
8-
'bower_components/angular-mocks/angular-mocks.js',
9-
'bower_components/jspdf/dist/jspdf.debug.js',
10-
'bower_components/forms-angular/dist/forms-angular.js',
11-
'bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js',
12-
'bower_components/angular-ui-bootstrap-bower/ui-bootstrap.js',
13-
'bower_components/angular-elastic/elastic.js',
6+
'client/bower_components/angular/angular.js',
7+
'client/bower_components/angular-sanitize/angular-sanitize.js',
8+
'client/bower_components/angular-mocks/angular-mocks.js',
9+
'client/bower_components/angular-messages/angular-messages.js',
10+
'client/bower_components/jspdf/dist/jspdf.debug.js',
11+
'client/bower_components/forms-angular/dist/forms-angular.js',
12+
'client/bower_components/ngInfiniteScroll/build/ng-infinite-scroll.js',
13+
'client/bower_components/angular-ui-bootstrap-bower/ui-bootstrap.js',
14+
'client/bower_components/angular-elastic/elastic.js',
1415
'src/**/*.js',
1516
'test/specs/**/*.js'
1617
],

0 commit comments

Comments
 (0)