Skip to content

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdubois
jdubois committed Jul 22, 2016
1 parent f3c367f commit 208e587
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cache:
- node_modules
- $HOME/.m2
env:
- NODE_VERSION=4.4.5
- NODE_VERSION=4.4.7
before_install:
- nvm install $NODE_VERSION
- npm install -g npm
Expand Down
2 changes: 1 addition & 1 deletion .yo-rc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"en"
],
"serverPort": 8080,
"jhipsterVersion": "3.5.0",
"jhipsterVersion": "3.5.1",
"enableSocialSignIn": false,
"useSass": false,
"jhiPrefix": "jhi"
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
node {
// uncomment these 2 lines and edit the name 'node-4.4.5' according to what you choose in configuration
// def nodeHome = tool name: 'node-4.4.5', type: 'jenkins.plugins.nodejs.tools.NodeJSInstallation'
// uncomment these 2 lines and edit the name 'node-4.4.7' according to what you choose in configuration
// def nodeHome = tool name: 'node-4.4.7', type: 'jenkins.plugins.nodejs.tools.NodeJSInstallation'
// env.PATH = "${nodeHome}/bin:${env.PATH}"

stage 'check tools'
Expand Down
4 changes: 2 additions & 2 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2016-07-20 using generator-jhipster 3.5.0
// Generated on 2016-07-22 using generator-jhipster 3.5.1
'use strict';

var gulp = require('gulp'),
Expand Down Expand Up @@ -182,7 +182,7 @@ gulp.task('swagger-ui', function () {
.pipe(gulp.dest(config.dist + 'swagger-ui/')),
gulp.src(config.bower + 'swagger-ui/dist/swagger-ui.min.js')
.pipe(gulp.dest(config.dist + 'swagger-ui/lib/'))
)
);
});

gulp.task('ngconstant:dev', function () {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"eslint-config-angular": "0.5.0",
"eslint-plugin-angular": "1.0.1",
"event-stream": "3.3.2",
"generator-jhipster": "3.5.0",
"generator-jhipster": "3.5.1",
"gulp": "3.9.1",
"gulp-angular-filesort": "1.1.1",
"gulp-angular-templatecache": "1.9.0",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -754,8 +754,8 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>v4.4.3</nodeVersion>
<npmVersion>3.8.3</npmVersion>
<nodeVersion>v4.4.7</nodeVersion>
<npmVersion>3.10.5</npmVersion>
</configuration>
</execution>
<execution>
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/mysql.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'
services:
jhipstersampleapplication-mysql:
container_name: jhipstersampleapplication-mysql
image: mysql:5.7.12
image: mysql:5.7.13
# volumes:
# - ~/volumes/jhipster/jhipsterSampleApplication/mysql/:/var/lib/mysql/
environment:
Expand Down
2 changes: 1 addition & 1 deletion src/main/docker/sonar.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '2'
services:
jhipstersampleapplication-sonar:
container_name: jhipstersampleapplication-sonar
image: sonarqube:5.5-alpine
image: sonarqube:5.6-alpine
ports:
- 9000:9000
- 9092:9092
48 changes: 24 additions & 24 deletions src/main/webapp/app/entities/bank-account/bank-account.state.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,30 +64,30 @@
}
})
.state('bank-account-detail.edit', {
parent: 'bank-account-detail',
url: '/detail/edit',
data: {
authorities: ['ROLE_USER']
},
onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
$uibModal.open({
templateUrl: 'app/entities/bank-account/bank-account-dialog.html',
controller: 'BankAccountDialogController',
controllerAs: 'vm',
backdrop: 'static',
size: 'lg',
resolve: {
entity: ['BankAccount', function(BankAccount) {
return BankAccount.get({id : $stateParams.id}).$promise;
}]
}
}).result.then(function() {
$state.go('^', {}, { reload: false });
}, function() {
$state.go('^');
});
}]
})
parent: 'bank-account-detail',
url: '/detail/edit',
data: {
authorities: ['ROLE_USER']
},
onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
$uibModal.open({
templateUrl: 'app/entities/bank-account/bank-account-dialog.html',
controller: 'BankAccountDialogController',
controllerAs: 'vm',
backdrop: 'static',
size: 'lg',
resolve: {
entity: ['BankAccount', function(BankAccount) {
return BankAccount.get({id : $stateParams.id}).$promise;
}]
}
}).result.then(function() {
$state.go('^', {}, { reload: false });
}, function() {
$state.go('^');
});
}]
})
.state('bank-account.new', {
parent: 'bank-account',
url: '/new',
Expand Down
48 changes: 24 additions & 24 deletions src/main/webapp/app/entities/label/label.state.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,30 +64,30 @@
}
})
.state('label-detail.edit', {
parent: 'label-detail',
url: '/detail/edit',
data: {
authorities: ['ROLE_USER']
},
onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
$uibModal.open({
templateUrl: 'app/entities/label/label-dialog.html',
controller: 'LabelDialogController',
controllerAs: 'vm',
backdrop: 'static',
size: 'lg',
resolve: {
entity: ['Label', function(Label) {
return Label.get({id : $stateParams.id}).$promise;
}]
}
}).result.then(function() {
$state.go('^', {}, { reload: false });
}, function() {
$state.go('^');
});
}]
})
parent: 'label-detail',
url: '/detail/edit',
data: {
authorities: ['ROLE_USER']
},
onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
$uibModal.open({
templateUrl: 'app/entities/label/label-dialog.html',
controller: 'LabelDialogController',
controllerAs: 'vm',
backdrop: 'static',
size: 'lg',
resolve: {
entity: ['Label', function(Label) {
return Label.get({id : $stateParams.id}).$promise;
}]
}
}).result.then(function() {
$state.go('^', {}, { reload: false });
}, function() {
$state.go('^');
});
}]
})
.state('label.new', {
parent: 'label',
url: '/new',
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/app/entities/operation/operation-detail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2><span translate="jhipsterSampleApplicationApp.operation.detail.title">Operat
<dt><span translate="jhipsterSampleApplicationApp.operation.label">Label</span></dt>
<dd>
<span ng-repeat="label in vm.operation.labels">
<a ui-sref="label-detail({id: {{label.id}}})">{{label.label}}</a>{{$last ? '' : ', '}}
<a ui-sref="label-detail({id: label.id})">{{label.label}}</a>{{$last ? '' : ', '}}
</span>
</dd>
</dl>
Expand Down
48 changes: 24 additions & 24 deletions src/main/webapp/app/entities/operation/operation.state.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,30 +64,30 @@
}
})
.state('operation-detail.edit', {
parent: 'operation-detail',
url: '/detail/edit',
data: {
authorities: ['ROLE_USER']
},
onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
$uibModal.open({
templateUrl: 'app/entities/operation/operation-dialog.html',
controller: 'OperationDialogController',
controllerAs: 'vm',
backdrop: 'static',
size: 'lg',
resolve: {
entity: ['Operation', function(Operation) {
return Operation.get({id : $stateParams.id}).$promise;
}]
}
}).result.then(function() {
$state.go('^', {}, { reload: false });
}, function() {
$state.go('^');
});
}]
})
parent: 'operation-detail',
url: '/detail/edit',
data: {
authorities: ['ROLE_USER']
},
onEnter: ['$stateParams', '$state', '$uibModal', function($stateParams, $state, $uibModal) {
$uibModal.open({
templateUrl: 'app/entities/operation/operation-dialog.html',
controller: 'OperationDialogController',
controllerAs: 'vm',
backdrop: 'static',
size: 'lg',
resolve: {
entity: ['Operation', function(Operation) {
return Operation.get({id : $stateParams.id}).$promise;
}]
}
}).result.then(function() {
$state.go('^', {}, { reload: false });
}, function() {
$state.go('^');
});
}]
})
.state('operation.new', {
parent: 'operation',
url: '/new',
Expand Down

0 comments on commit 208e587

Please sign in to comment.