Skip to content

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois committed Jun 16, 2017
1 parent 1f9eb7f commit 22cd67f
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"en"
],
"serverPort": 8080,
"jhipsterVersion": "4.5.3",
"jhipsterVersion": "4.5.4",
"enableSocialSignIn": false,
"useSass": false,
"jhiPrefix": "jhi",
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# jhipsterSampleApplication
This application was generated using JHipster 4.5.3, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.5.3](https://jhipster.github.io/documentation-archive/v4.5.3).
This application was generated using JHipster 4.5.4, you can find documentation and help at [https://jhipster.github.io/documentation-archive/v4.5.4](https://jhipster.github.io/documentation-archive/v4.5.4).

## Development

Expand Down Expand Up @@ -96,13 +96,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als
To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information.

[JHipster Homepage and latest documentation]: https://jhipster.github.io
[JHipster 4.5.3 archive]: https://jhipster.github.io/documentation-archive/v4.5.3
[JHipster 4.5.4 archive]: https://jhipster.github.io/documentation-archive/v4.5.4

[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.5.3/development/
[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.5.3/docker-compose
[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.5.3/production/
[Running tests page]: https://jhipster.github.io/documentation-archive/v4.5.3/running-tests/
[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.5.3/setting-up-ci/
[Using JHipster in development]: https://jhipster.github.io/documentation-archive/v4.5.4/development/
[Using Docker and Docker-Compose]: https://jhipster.github.io/documentation-archive/v4.5.4/docker-compose
[Using JHipster in production]: https://jhipster.github.io/documentation-archive/v4.5.4/production/
[Running tests page]: https://jhipster.github.io/documentation-archive/v4.5.4/running-tests/
[Setting up Continuous Integration]: https://jhipster.github.io/documentation-archive/v4.5.4/setting-up-ci/

[Gatling]: http://gatling.io/
[Node.js]: https://nodejs.org/
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Generated on 2017-06-16 using generator-jhipster 4.5.3
// Generated on 2017-06-16 using generator-jhipster 4.5.4
'use strict';

var gulp = require('gulp'),
Expand Down
2 changes: 1 addition & 1 deletion package.json
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": "2.2.1",
"event-stream": "3.3.4",
"generator-jhipster": "4.5.3",
"generator-jhipster": "4.5.4",
"gulp": "3.9.1",
"gulp-angular-filesort": "1.1.1",
"gulp-angular-templatecache": "2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<maven.version>3.0.0</maven.version>
<metrics-spring.version>3.1.3</metrics-spring.version>
<node.version>v6.10.3</node.version>
<node.version>v6.11.0</node.version>
<!-- These remain empty unless the corresponding profile is active -->
<profile.no-liquibase />
<profile.swagger />
Expand Down Expand Up @@ -90,7 +90,7 @@
<!-- Spring properties -->
<springfox.version>2.6.1</springfox.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<yarn.version>v0.24.4</yarn.version>
<yarn.version>v0.24.6</yarn.version>
</properties>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1 data-translate="reset.request.title">Reset your password</h1>
<p data-translate="reset.request.messages.info">Enter the email address you used to register.</p>
</div>

<div class="alert alert-success" ng-show="vm.success == 'OK'">
<div class="alert alert-success" ng-show="vm.success === 'OK'">
<p data-translate="reset.request.messages.success">Check your emails for details on how to reset your password.</p>
</div>

Expand Down
8 changes: 4 additions & 4 deletions src/main/webapp/app/admin/configuration/configuration.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<h2 data-translate="configuration.title">Configuration</h2>

<span data-translate="configuration.filter">Filter (by prefix)</span> <input type="text" ng-model="filter" class="form-control">
<label ng-hide="filteredConfig.length == 0">Spring configuration</label>
<label ng-hide="filteredConfig.length === 0">Spring configuration</label>
<table class="table table-condensed table-striped table-bordered table-responsive"
style="table-layout:fixed" ng-hide="filteredConfig.length == 0">
style="table-layout:fixed" ng-hide="filteredConfig.length === 0">
<thead>
<tr>
<th ng-click="predicate = 'prefix'; reverse=!reverse" class="col-sm-4"><span data-translate="configuration.table.prefix">Prefix</span></th>
Expand All @@ -25,9 +25,9 @@ <h2 data-translate="configuration.title">Configuration</h2>
</tr>
</table>
<div ng-repeat="(key, value) in vm.allConfiguration">
<label ng-hide="filtered.length == 0"><span>{{key}}</span></label>
<label ng-hide="filtered.length === 0"><span>{{key}}</span></label>
<table class="table table-condensed table-striped table-bordered table-responsive"
style="table-layout:fixed" ng-hide="filtered.length == 0">
style="table-layout:fixed" ng-hide="filtered.length === 0">
<thead>
<tr>
<th class="col-sm-4">Property</th>
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/app/components/language/language.filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
'ta': 'தமிழ்',
'th': 'ไทย',
'tr': 'Türkçe',
'ua': 'Українська',
'vi': 'Tiếng Việt',
'zh-cn': '中文(简体)',
'zh-tw': '繁體中文'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

var jhiItemCount = {
template: '<div class="info">' +
'Showing {{(($ctrl.page - 1) * $ctrl.itemsPerPage) == 0 ? 1 : (($ctrl.page - 1) * $ctrl.itemsPerPage + 1)}} - ' +
'Showing {{(($ctrl.page - 1) * $ctrl.itemsPerPage) === 0 ? 1 : (($ctrl.page - 1) * $ctrl.itemsPerPage + 1)}} - ' +
'{{($ctrl.page * $ctrl.itemsPerPage) < $ctrl.queryCount ? ($ctrl.page * $ctrl.itemsPerPage) : $ctrl.queryCount}} ' +
'of {{$ctrl.queryCount}} items.' +
'</div>',
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/swagger-ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
for(var i=0; i<ca.length; i++) {
var c = ca[i];
while (c.charAt(0)==' ') c = c.substring(1);
if (c.indexOf(name) != -1) return c.substring(name.length,c.length);
if (c.indexOf(name) !== -1) return c.substring(name.length,c.length);
}
return "";
}
Expand All @@ -115,7 +115,7 @@
var security = {};
window.springfox.securityConfig(function(data) {
security = data;
if (typeof initOAuth == "function" && oAuthIsDefined(security)) {
if (typeof initOAuth === "function" && oAuthIsDefined(security)) {
initOAuth(security);
}
});
Expand Down
28 changes: 17 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1191,18 +1191,24 @@ debug@0.7.4:
version "0.7.4"
resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"

debug@2, debug@2.6.7:
version "2.6.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
debug@2, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0:
version "2.6.8"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
dependencies:
ms "2.0.0"

debug@2.2.0, debug@^2.0.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@~2.2.0:
debug@2.2.0, debug@~2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
dependencies:
ms "0.7.1"

debug@2.6.7:
version "2.6.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.7.tgz#92bad1f6d05bbb6bba22cca88bcd0ec894c2861e"
dependencies:
ms "2.0.0"

decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
version "1.2.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
Expand Down Expand Up @@ -2299,9 +2305,9 @@ generate-object-property@^1.1.0:
dependencies:
is-property "^1.0.0"

generator-jhipster@4.5.3:
version "4.5.3"
resolved "https://registry.yarnpkg.com/generator-jhipster/-/generator-jhipster-4.5.3.tgz#23173fa29f288adab8fbe5c659d0ba3bc8eca876"
generator-jhipster@4.5.4:
version "4.5.4"
resolved "https://registry.yarnpkg.com/generator-jhipster/-/generator-jhipster-4.5.4.tgz#7db7483f8cd1092bde0bce15aaf1e6e60de2e7b7"
dependencies:
chalk "1.1.3"
cheerio "0.22.0"
Expand All @@ -2311,7 +2317,7 @@ generator-jhipster@4.5.3:
glob "7.1.1"
html-wiring "1.2.0"
insight "0.8.4"
jhipster-core "1.3.2"
jhipster-core "1.3.3"
js-yaml "3.8.3"
lodash "4.17.4"
mkdirp "0.5.1"
Expand Down Expand Up @@ -3782,9 +3788,9 @@ jasminewd2@0.0.9:
version "0.0.9"
resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-0.0.9.tgz#d6be40841d440dbe1ceee5a078de62683b0e56a7"

jhipster-core@1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/jhipster-core/-/jhipster-core-1.3.2.tgz#5b2675c7682be098b1238760474a32657905bdae"
jhipster-core@1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/jhipster-core/-/jhipster-core-1.3.3.tgz#2e26079d96cae9e5441bae81b480bbed759ace62"
dependencies:
lodash "4.17.4"

Expand Down

0 comments on commit 22cd67f

Please sign in to comment.