Commit Graph

23 Commits

Author SHA1 Message Date
Семенова Мария
c228f5aee0 Merge branch 'dev' into 33-paper-url
# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/service/PaperService.java
#	src/main/resources/db/changelog-master.xml
2019-03-23 12:04:51 +04:00
Семенова Мария
e6bf603edc #33 url in paper 2019-03-18 23:31:33 +04:00
Семенова Мария
cb394edf90 #13 file list on paper page 2019-03-18 16:02:55 +04:00
Семенова Мария
7b601c744f #13 change model, schema 2019-03-18 11:07:30 +04:00
Anton Romanov
90bb94d864 add patronymic 2019-03-12 14:44:11 +04:00
Anton Romanov
ce78f8ad66 some refactor 2018-12-28 13:57:20 +04:00
T-Midnight
fcbd91760d Rename table grant to grants 2018-12-24 23:39:19 +04:00
Anton Romanov
ac569ed9a9 Merge branch 'master' into 46-mvc
# Conflicts:
#	src/main/java/ru/ulstu/paper/controller/PaperController.java
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/resources/public/js/papers.js
#	src/main/resources/templates/papers/paper.html
#	src/main/resources/templates/papers/papers.html
2018-12-14 16:00:33 +04:00
Anton Romanov
d71a8d2c83 move classes, add deadline to entities, fix db changelogs 2018-12-11 15:08:35 +04:00
T-Midnight
590cd16abe Create model for grant, deadline and project 2018-12-08 23:53:38 +04:00
Anton Romanov
f376fedc64 load paper 2018-11-26 23:07:14 +04:00
Anton Romanov
f0ac06c900 refactor and db changes 2018-11-11 01:29:06 +04:00
Anton Romanov
1b53debc88 Merge branch 'master' into 21-Event-status
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2018-11-09 15:08:10 +04:00
Anton Romanov
4c43776528 add config parameter 2018-11-08 20:08:26 +04:00
Alyona
8fe9f6625c changelog 2018-10-31 20:06:27 +04:00
Anton Romanov
d721907c24 Merge branch 'master' into 4-show-time-line
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2018-10-30 23:29:18 +04:00
Anton Romanov
02499c0aae fix db 2018-10-30 23:26:55 +04:00
Anton Romanov
128b147bf2 Revert "remove liquibase"
This reverts commit 43917c0
2018-10-30 23:07:01 +04:00
Anton Romanov
7388b2cb27 add database column 2018-10-27 23:16:14 +04:00
Anton Romanov
43917c043d remove liquibase 2018-06-09 22:58:32 +04:00
Anton Romanov
2fda487555 add paper authors 2018-05-05 14:49:34 +04:00
Anton Romanov
d8fa601103 add file uploading 2018-05-05 00:24:48 +04:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00