Merge branch 'develop' into 'master' (9162c728) · 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
9162c728

Commit 9162c728 authored 3 years ago by

GAYDAMAKHA MIKHAIL

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Develop

See merge request !41

parents fb9048fb 7be958ef

Branches

1 merge request!41Develop

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/fr/unistra/sil/erp/back/controller/web/WebRegistryController.java 29 additions, 2 deletions

...ra/sil/erp/back/controller/web/WebRegistryController.java
src/main/java/fr/unistra/sil/erp/back/model/RegistryInfo.java 76 additions, 0 deletions

...main/java/fr/unistra/sil/erp/back/model/RegistryInfo.java
src/main/resources/static/css/main.css 4 additions, 0 deletions

src/main/resources/static/css/main.css
src/main/resources/templates/registry.html 12 additions, 0 deletions

src/main/resources/templates/registry.html

with 121 additions and 2 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