Merge branch 'develop' into 'master' (9b1c1bca) · Commits · ERP (SIL) / BACK · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

BACK
- Activity
- Members
- Labels
- Issues
  4
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

ERP (SIL)
BACK
Commits
9b1c1bca

Commit 9b1c1bca authored 3 years ago by

BEAUVAIS ANTOINE

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Internationalization.

See merge request !15

parents 208c8d1b 7862adf9

Branches

1 merge request!15Internationalization.

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

README.fr.md 6 additions, 5 deletions

README.fr.md
README.md 4 additions, 2 deletions

README.md
build.gradle 5 additions, 3 deletions

build.gradle
src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java 4 additions, 0 deletions

src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java
src/main/java/fr/unistra/sil/erp/back/controller/web/LoginController.java 32 additions, 0 deletions

.../unistra/sil/erp/back/controller/web/LoginController.java
src/main/java/fr/unistra/sil/erp/back/controller/web/package-info.java 4 additions, 0 deletions

.../fr/unistra/sil/erp/back/controller/web/package-info.java
src/main/resources/messages.properties 10 additions, 0 deletions

src/main/resources/messages.properties
src/main/resources/messages_en.properties 10 additions, 0 deletions

src/main/resources/messages_en.properties
src/main/resources/messages_fr.properties 10 additions, 0 deletions

src/main/resources/messages_fr.properties
src/main/resources/templates/login.html 12 additions, 0 deletions

src/main/resources/templates/login.html

with 97 additions and 10 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment