Commit Graph

10 Commits

Author SHA1 Message Date
arefiev1997
48d7131593 gl_88 inviting user 2019-05-13 03:16:37 +04:00
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
2019-04-23 11:35:41 +04:00
Anton Romanov
32c7261c2e #102 restore old swagger 2019-04-17 18:13:21 +04:00
Anton Romanov
cfbe36197b #102 add auto tests 2019-04-17 17:20:20 +04:00
Anton Romanov
c7cdbe9044 #83 add tasks, modify build script for passing application properties 2019-04-05 17:35:17 +04:00
Anton Romanov
e74261184f #73 first fixes by update versions 2019-03-20 14:37:57 +04:00
Anton Romanov
35a08ab451 save authors 2018-12-05 18:08:47 +04:00
Anton Romanov
c774820d95 fix build script for netbeans 2018-11-14 17:14:56 +04:00
885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 2018-05-20 08:05:21 +02:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00