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

Commit d4ff9627 authored 3 years ago by

BEAUVAIS ANTOINE

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Added category names to Item JSON.

See merge request !31

parents f7cfa865 3851e471

Branches

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/fr/unistra/sil/erp/back/controller/api/ApiRetrieveItemsController.java 1 addition, 1 deletion

...l/erp/back/controller/api/ApiRetrieveItemsController.java
src/main/java/fr/unistra/sil/erp/back/model/Item.java 35 additions, 0 deletions

src/main/java/fr/unistra/sil/erp/back/model/Item.java
src/main/java/fr/unistra/sil/erp/back/repository/IItemsRepository.java 6 additions, 0 deletions

.../fr/unistra/sil/erp/back/repository/IItemsRepository.java
src/main/java/fr/unistra/sil/erp/back/repository/item/SqliteItemsRepository.java 30 additions, 0 deletions

...a/sil/erp/back/repository/item/SqliteItemsRepository.java

with 72 additions and 1 deletion

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