Merge branch 'develop' of git.unistra.fr:erp-sil/back into develop
Showing
- src/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java 5 additions, 0 deletionssrc/main/java/fr/unistra/sil/erp/back/WebMvcConfig.java
- src/main/java/fr/unistra/sil/erp/back/controller/web/WebRegistryController.java 4 additions, 3 deletions...ra/sil/erp/back/controller/web/WebRegistryController.java
- src/main/java/fr/unistra/sil/erp/back/filter/CORSFilter.java 29 additions, 0 deletionssrc/main/java/fr/unistra/sil/erp/back/filter/CORSFilter.java
- src/main/java/fr/unistra/sil/erp/back/model/RegistryEntry.java 55 additions, 0 deletions...ain/java/fr/unistra/sil/erp/back/model/RegistryEntry.java
- src/main/java/fr/unistra/sil/erp/back/repository/registry/SqliteRegistryRepository.java 10 additions, 5 deletions...rp/back/repository/registry/SqliteRegistryRepository.java
- src/main/resources/messages.properties 6 additions, 6 deletionssrc/main/resources/messages.properties
- src/main/resources/messages_en.properties 6 additions, 6 deletionssrc/main/resources/messages_en.properties
- src/main/resources/messages_fr.properties 6 additions, 6 deletionssrc/main/resources/messages_fr.properties
- src/main/resources/templates/registry.html 16 additions, 10 deletionssrc/main/resources/templates/registry.html
- src/main/resources/templates/stocks.html 0 additions, 30 deletionssrc/main/resources/templates/stocks.html
Please register or sign in to comment