diff --git a/.yo-rc.json b/.yo-rc.json index 9ffc85d87..fa1d8713f 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -23,7 +23,7 @@ "en" ], "serverPort": 8080, - "jhipsterVersion": "4.13.2", + "jhipsterVersion": "4.13.3", "enableSocialSignIn": false, "useSass": false, "jhiPrefix": "jhi", diff --git a/README.md b/README.md index 506fbbf3d..db061ca86 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # jhipsterSampleApplication -This application was generated using JHipster 4.13.2, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v4.13.2](http://www.jhipster.tech/documentation-archive/v4.13.2). +This application was generated using JHipster 4.13.3, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v4.13.3](http://www.jhipster.tech/documentation-archive/v4.13.3). ## Development @@ -152,13 +152,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]: http://www.jhipster.tech -[JHipster 4.13.2 archive]: http://www.jhipster.tech/documentation-archive/v4.13.2 +[JHipster 4.13.3 archive]: http://www.jhipster.tech/documentation-archive/v4.13.3 -[Using JHipster in development]: http://www.jhipster.tech/documentation-archive/v4.13.2/development/ -[Using Docker and Docker-Compose]: http://www.jhipster.tech/documentation-archive/v4.13.2/docker-compose -[Using JHipster in production]: http://www.jhipster.tech/documentation-archive/v4.13.2/production/ -[Running tests page]: http://www.jhipster.tech/documentation-archive/v4.13.2/running-tests/ -[Setting up Continuous Integration]: http://www.jhipster.tech/documentation-archive/v4.13.2/setting-up-ci/ +[Using JHipster in development]: http://www.jhipster.tech/documentation-archive/v4.13.3/development/ +[Using Docker and Docker-Compose]: http://www.jhipster.tech/documentation-archive/v4.13.3/docker-compose +[Using JHipster in production]: http://www.jhipster.tech/documentation-archive/v4.13.3/production/ +[Running tests page]: http://www.jhipster.tech/documentation-archive/v4.13.3/running-tests/ +[Setting up Continuous Integration]: http://www.jhipster.tech/documentation-archive/v4.13.3/setting-up-ci/ [Gatling]: http://gatling.io/ [Node.js]: https://nodejs.org/ diff --git a/package.json b/package.json index 1560952d7..71cae503d 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "exports-loader": "0.6.4", "extract-text-webpack-plugin": "3.0.2", "file-loader": "1.1.5", - "generator-jhipster": "4.13.2", + "generator-jhipster": "4.13.3", "html-loader": "0.5.0", "html-webpack-plugin": "2.30.1", "jasmine-core": "2.7.0", @@ -85,7 +85,7 @@ "webpack-notifier": "1.5.0", "webpack-visualizer-plugin": "0.1.11", "web-app-manifest-loader": "0.1.1", - "workbox-webpack-plugin": "2.1.2", + "workbox-webpack-plugin": "3.0.0-alpha.3", "write-file-webpack-plugin": "4.1.0" }, "engines": { diff --git a/pom.xml b/pom.xml index a31165ed7..b852a21f1 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ - 0.1.5 + 0.1.6 1.5.9.RELEASE @@ -438,14 +438,14 @@ src/main/resources/ true - config/application.yml + config/*.yml src/main/resources/ false - config/application.yml + config/*.yml diff --git a/src/main/java/io/github/jhipster/sample/config/Constants.java b/src/main/java/io/github/jhipster/sample/config/Constants.java index 747e5613b..b22853b95 100644 --- a/src/main/java/io/github/jhipster/sample/config/Constants.java +++ b/src/main/java/io/github/jhipster/sample/config/Constants.java @@ -6,7 +6,7 @@ public final class Constants { // Regex for acceptable logins - public static final String LOGIN_REGEX = "^[_'.A-Za-z0-9-]*$"; + public static final String LOGIN_REGEX = "^[_'.@A-Za-z0-9-]*$"; public static final String SYSTEM_ACCOUNT = "system"; public static final String ANONYMOUS_USER = "anonymoususer"; diff --git a/src/main/webapp/app/account/register/register.component.html b/src/main/webapp/app/account/register/register.component.html index 969f10bde..0682f1608 100644 --- a/src/main/webapp/app/account/register/register.component.html +++ b/src/main/webapp/app/account/register/register.component.html @@ -30,7 +30,7 @@

Registration

+ required minlength="1" maxlength="50" pattern="^[_'.@A-Za-z0-9-]*$">
Your username is required. diff --git a/src/main/webapp/app/admin/user-management/user-management-dialog.component.html b/src/main/webapp/app/admin/user-management/user-management-dialog.component.html index 082b48a56..c7e51a6a5 100644 --- a/src/main/webapp/app/admin/user-management/user-management-dialog.component.html +++ b/src/main/webapp/app/admin/user-management/user-management-dialog.component.html @@ -17,7 +17,7 @@
diff --git a/src/main/webapp/app/polyfills.ts b/src/main/webapp/app/polyfills.ts index 5b8406f32..fce352adb 100644 --- a/src/main/webapp/app/polyfills.ts +++ b/src/main/webapp/app/polyfills.ts @@ -29,6 +29,7 @@ import 'core-js/es6/math'; import 'core-js/es6/string'; import 'core-js/es6/date'; import 'core-js/es6/array'; +import 'core-js/es7/array'; import 'core-js/es6/regexp'; import 'core-js/es6/map'; import 'core-js/es6/weak-map'; diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json index 64d437244..ebf3021d8 100644 --- a/src/main/webapp/i18n/en/global.json +++ b/src/main/webapp/i18n/en/global.json @@ -119,7 +119,7 @@ "pattern": "This field should follow pattern for {{ pattern }}.", "number": "This field should be a number.", "datetimelocal": "This field should be a date and time.", - "patternLettersAndDigits": "This field can only contain letters and digits." + "patternLogin": "This field can only contain letters, digits and e-mail addresses." } }, "error": { diff --git a/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts b/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts index 21cc7f7af..d9f7c15ad 100644 --- a/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts +++ b/src/test/javascript/spec/app/admin/audits/audits.component.spec.ts @@ -7,6 +7,10 @@ import { AuditsComponent } from '../../../../../../main/webapp/app/admin/audits/ import { AuditsService } from '../../../../../../main/webapp/app/admin/audits/audits.service'; import { ITEMS_PER_PAGE } from '../../../../../../main/webapp/app/shared'; +function build2DigitsDatePart(datePart: number) { + return `0${datePart}`.slice(-2); +} + function getDate(isToday= true) { let date: Date = new Date(); if (isToday) { @@ -20,8 +24,9 @@ function getDate(isToday= true) { date = new Date(date.getFullYear(), date.getMonth() - 1, date.getDate()); } } - const dateString = date.getDate() < 10 ? '0' + date.getDate() : '' + date.getDate(); - return `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}-${dateString}`; + const monthString = build2DigitsDatePart(date.getMonth() + 1); + const dateString = build2DigitsDatePart(date.getDate()); + return `${date.getFullYear()}-${monthString}-${dateString}`; } describe('Component Tests', () => { diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index f2cab4371..88bf59aea 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -87,12 +87,6 @@ module.exports = webpackMerge(commonConfig({ env: ENV }), { debug: false }), new WorkboxPlugin({ - // to cache all under target/www - globDirectory: utils.root('target/www'), - // find these files and cache them - globPatterns: ['**/*.{html,bundle.js,css,png,svg,jpg,gif,json}'], - // create service worker at the target/www - swDest: path.resolve(utils.root('target/www'), 'sw.js'), clientsClaim: true, skipWaiting: true, })