Commit Graph

22 Commits

Author SHA1 Message Date
Anton Romanov
955bdaa438 fix repository method 2019-04-23 13:55:59 +04:00
Anton Romanov
60dfad5d76 Merge branch 'dev' into move-to-jdk11
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2019-04-23 13:51:21 +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
Васин Антон
019fe7c652 #97 adding deadlines 2019-04-23 10:32:23 +03:00
Васин Антон
53cc947a17 #97 copy from DTO edited 2019-04-22 15:48:29 +03:00
Васин Антон
349e7373ff #97 save function 2019-04-22 14:19:01 +03:00
Васин Антон
d015b02862 #96 removed wildcards from imports 2019-04-18 13:26:11 +03:00
Васин Антон
b722687050 #96 edit project page 2019-04-18 10:32:43 +03:00
Васин Антон
e85c814f70 #96 project comment added 2019-04-17 14:46:42 +03:00
Васин Антон
255692d6ea #96 project status added 2019-04-17 14:38:07 +03:00
Васин Антон
ca3e87a8c5 #96 edit project blank page 2019-04-17 13:50:22 +03:00
Васин Антон
f5c1bb940c #86 projects main page 2019-04-17 11:24:30 +03:00
Anton Romanov
1487affb8e #73 fix deprecated annotations and classes 2019-03-20 19:20:28 +04:00
Anton Romanov
e74261184f #73 first fixes by update versions 2019-03-20 14:37:57 +04:00
T-Midnight
29df7120bf Delete DeadlineDTO and update usages 2019-03-18 14:27:54 +04:00
Anton Romanov
4f47b1beb6 fix code 2019-03-04 10:28:46 +04:00
Anton Romanov
ce78f8ad66 some refactor 2018-12-28 13:57:20 +04:00
T-Midnight
bcc64cda96 Create model folder for grant 2018-12-25 12:50:14 +04:00
T-Midnight
d7721ce19d Update classes 2018-12-24 15:20:57 +04:00
T-Midnight
410d0d9634 Create service&repository for Project 2018-12-24 13:05:37 +04:00
T-Midnight
c2a32d6c27 Update ProjectDto 2018-12-23 02:22:31 +04:00
Anton Romanov
d71a8d2c83 move classes, add deadline to entities, fix db changelogs 2018-12-11 15:08:35 +04:00