Skip to content

Commit

Permalink
automatic project update
Browse files Browse the repository at this point in the history
  • Loading branch information
jdubois committed Jan 9, 2018
1 parent e8f76aa commit 430185a
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"en"
],
"serverPort": 8080,
"jhipsterVersion": "4.13.2",
"jhipsterVersion": "4.13.3",
"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.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

Expand Down Expand Up @@ -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/
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<profile.swagger />

<!-- Dependency versions -->
<jhipster-dependencies.version>0.1.5</jhipster-dependencies.version>
<jhipster-dependencies.version>0.1.6</jhipster-dependencies.version>
<!-- The spring-boot version should match the one managed by
https://mvnrepository.com/artifact/io.github.jhipster/jhipster-dependencies/${jhipster-dependencies.version} -->
<spring-boot.version>1.5.9.RELEASE</spring-boot.version>
Expand Down Expand Up @@ -438,14 +438,14 @@
<directory>src/main/resources/</directory>
<filtering>true</filtering>
<includes>
<include>config/application.yml</include>
<include>config/*.yml</include>
</includes>
</resource>
<resource>
<directory>src/main/resources/</directory>
<filtering>false</filtering>
<excludes>
<exclude>config/application.yml</exclude>
<exclude>config/*.yml</exclude>
</excludes>
</resource>
</resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h1 jhiTranslate="register.title">Registration</h1>
<div class="form-group">
<label class="form-control-label" for="login" jhiTranslate="global.form.username">Username</label>
<input type="text" class="form-control" [(ngModel)]="registerAccount.login" id="login" name="login" #login="ngModel" placeholder="{{'global.form.username.placeholder' | translate}}"
required minlength="1" maxlength="50" pattern="^[_'.A-Za-z0-9-]*$">
required minlength="1" maxlength="50" pattern="^[_'.@A-Za-z0-9-]*$">
<div *ngIf="login.dirty && login.invalid">
<small class="form-text text-danger" *ngIf="login.errors.required" jhiTranslate="register.messages.validate.login.required">
Your username is required.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h4 class="modal-title" id="myUserLabel" jhiTranslate="userManagement.home.creat
<div class="form-group">
<label class="form-control-label" jhiTranslate="userManagement.login">Login</label>
<input type="text" class="form-control" name="login" #loginInput="ngModel"
[(ngModel)]="user.login" required minlength="1" maxlength="50" pattern="^[_'.A-Za-z0-9-]*$">
[(ngModel)]="user.login" required minlength="1" maxlength="50" pattern="^[_'.@A-Za-z0-9-]*$">

<div *ngIf="loginInput.dirty && loginInput.invalid">
<small class="form-text text-danger"
Expand All @@ -32,8 +32,8 @@ <h4 class="modal-title" id="myUserLabel" jhiTranslate="userManagement.home.creat
</small>

<small class="form-text text-danger"
*ngIf="loginInput.errors.pattern" jhiTranslate="entity.validation.patternLettersAndDigits">
This field can only contain letters and digits.
*ngIf="loginInput.errors.pattern" jhiTranslate="entity.validation.patternLogin">
This field can only contain letters, digits and e-mail addresses.
</small>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/main/webapp/app/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/i18n/en/global.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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', () => {
Expand Down
6 changes: 0 additions & 6 deletions webpack/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
Expand Down

0 comments on commit 430185a

Please sign in to comment.