Семенова Мария a2dca6b7c6 Merge branch 'dev' into paper-latex-editing ... # Conflicts: # src/main/java/ru/ulstu/paper/model/Paper.java # src/main/java/ru/ulstu/paper/model/PaperDto.java # src/main/java/ru/ulstu/paper/service/PaperService.java # src/main/resources/db/changelog-master.xml # src/main/resources/templates/papers/paper.html		2019-04-18 18:20:51 +04:00
..
commit	add java code	2018-05-04 17:08:20 +04:00
conference	#65 added delete method of article, fixed copyFromDto method	2019-04-16 14:18:49 +04:00
configuration	#83 add tasks, modify build script for passing application properties	2019-04-05 17:35:17 +04:00
core	#102 add auto tests	2019-04-17 17:20:20 +04:00
deadline	#62 fix remove deadline in other JPA operation	2019-04-13 22:59:59 +04:00
file	pdf generating	2019-03-25 13:17:34 +04:00
grant	#55 refactor controller navigation, fix conference edit url	2019-04-08 07:40:26 +04:00
index/controller	#80 hide mvc controllers from api	2019-03-28 14:45:39 +04:00
odin	fix code	2018-11-14 17:03:22 +04:00
odinexample	add java code	2018-05-04 17:08:20 +04:00
paper	Merge branch 'dev' into paper-latex-editing	2019-04-18 18:20:51 +04:00
project	#96 removed wildcards from imports	2019-04-18 13:26:11 +03:00
strategy/api	move class	2018-11-11 12:43:27 +04:00
students	#74 fixing codestyle and tags	2019-04-14 17:50:23 +04:00
tags	#74 some code fixes	2019-04-16 13:41:10 +04:00
timeline	#18 add paper events	2019-03-28 12:40:10 +04:00
user	#82 fix user abbreviate	2019-04-05 13:39:53 +04:00
NgTrackerApplication.java	#83 add tasks, modify build script for passing application properties	2019-04-05 17:35:17 +04:00