Commit Graph

9 Commits (a53a12fa557b3b85787edcb9cf1079dd41870f7d)

Author SHA1 Message Date
Anton Romanov 7684bac74d Merge branch 'dev' into move-to-jdk11
# Conflicts:
#	build.gradle
#	src/main/java/ru/ulstu/grant/model/GrantDto.java
#	src/main/java/ru/ulstu/grant/service/GrantService.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/java/ru/ulstu/project/model/Project.java
5 years ago
Anton Romanov 32c7261c2e #102 restore old swagger 5 years ago
Anton Romanov cfbe36197b #102 add auto tests 5 years ago
Anton Romanov c7cdbe9044 #83 add tasks, modify build script for passing application properties 5 years ago
Anton Romanov e74261184f #73 first fixes by update versions 5 years ago
Anton Romanov 35a08ab451 save authors 6 years ago
Anton Romanov c774820d95 fix build script for netbeans 6 years ago
Aleksey Filippov 885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 6 years ago
Anton Romanov 671cfdd486 add java code 6 years ago