530 Commits

Author SHA1 Message Date
Anton Romanov
cfbe36197b add auto tests 2019-04-17 17:20:20 +04:00
Васин Антон
e85c814f70 project comment added 2019-04-17 14:46:42 +03:00
Васин Антон
255692d6ea project status added 2019-04-17 14:38:07 +03:00
Васин Антон
f079e34a57 project title added 2019-04-17 14:18:35 +03:00
Васин Антон
4ea40931eb project status fragment added 2019-04-17 14:06:38 +03:00
Васин Антон
a89d93a9b0 project line fragment added 2019-04-17 14:01:45 +03:00
Nightblade73
7e4d8d4918 added method take part in conference 2019-04-17 14:51:19 +04:00
Васин Антон
ca3e87a8c5 edit project blank page 2019-04-17 13:50:22 +03:00
T-Midnight
506fa01fab Revert: merge with dev 2019-04-17 13:42:22 +04:00
T-Midnight
97d7d00098 merge with dev 2019-04-17 13:30:14 +04:00
T-Midnight
1e6b3cba3a delete blank lines, fix js, fix leaderId validation 2019-04-17 13:25:10 +04:00
Nightblade73
8564f2cf34 managed to create a connection through a new entity 2019-04-17 13:00:48 +04:00
Anton Romanov
487aa578a7 Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"

Closes 

See merge request 
2019-04-17 07:35:00 +00:00
Васин Антон
f5c1bb940c projects main page 2019-04-17 11:24:30 +03:00
Nightblade73
14c28050c7 changed interface 2019-04-17 11:19:23 +04:00
Anton Romanov
b05a32edac fix issue template 2019-04-17 09:33:58 +04:00
Anton Romanov
7491d7e9e4 Merge branch '65-undock-article' into 'dev'
Resolve "Удалить статью"

Closes 

See merge request 
2019-04-16 11:13:20 +00:00
Nightblade73
81d07645c2 added delete method of article, fixed copyFromDto method 2019-04-16 14:18:49 +04:00
Anton Romanov
3facc0c26e Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"

Closes  and 

See merge request 
2019-04-16 09:36:58 +00:00
Anton Romanov
d81d1cf72c some code fixes 2019-04-16 13:41:10 +04:00
Anton Romanov
0c719d8886 Merge branch '66-attach-exist-article' into 'dev'
Resolve "Прикрепление статьи"

Closes 

See merge request 
2019-04-16 09:33:57 +00:00
Nightblade73
d4b38d314f fixed bug, when attach-article lose what needed to attach after add or remove deadline 2019-04-16 13:22:15 +04:00
anastasia shulga
95f70f425a Update2 TagService.java 2019-04-16 08:21:36 +00:00
anastasia shulga
dbd61ce80c Update TagService.java 2019-04-16 07:55:37 +00:00
Nightblade73
dca644eba1 added handling of adding articles not added to the picker. 2019-04-16 10:42:40 +04:00
Nightblade73
fbf9a7943b changed from Set to List 2019-04-16 09:51:31 +04:00
Nightblade73
735cbb5f7b added front-end part 2019-04-16 09:46:24 +04:00
Anton Romanov
06b5d66d3e Merge branch '58-delete-conf' into 'dev'
Resolve "Удаление конференции"

Closes 

See merge request 
2019-04-15 17:32:22 +00:00
Nightblade73
909c657c89 added delete confirm 2019-04-15 15:48:17 +04:00
Nightblade73
0cc8de2d32 added delete method of conference 2019-04-15 10:36:55 +04:00
Anton Romanov
9e657a7d2d Merge branch '62-delete-deadline' into 'dev'
Resolve "Удаление дедлайна"

Closes 

See merge request 
2019-04-14 19:33:45 +00:00
Nightblade73
f88f035e65 little fix 2019-04-14 21:34:39 +04:00
ASH
1f36e04cd3 fully adding tags 2019-04-14 21:24:22 +04:00
Nightblade73
8cfc64ea85 added delete input style 2019-04-14 20:42:11 +04:00
ASH
d6a11a5902 fixing codestyle and tags 2019-04-14 17:50:23 +04:00
Anton Romanov
8b2a559d37 fix thymeleaf expressions 2019-04-13 23:56:24 +04:00
Anton Romanov
34499abd60 fix remove deadline in other JPA operation 2019-04-13 22:59:59 +04:00
Nightblade73
9711febefb added delete deadline 2019-04-13 13:02:36 +04:00
T-Midnight
1756f29505 filter authors by leader and degree 2019-04-13 12:39:53 +04:00
Nightblade73
b4a2a8086d remove verification of empty deadline list 2019-04-12 15:51:06 +04:00
Anton Romanov
4955e9a637 #4--2 merge with dev 2019-04-11 22:39:59 +04:00
Anton Romanov
cafb3abcee #4--2 merge with dev 2019-04-11 22:37:32 +04:00
T-Midnight
bd3513118c this don't work 2019-04-11 21:42:28 +04:00
T-Midnight
f7d766f02d rename birth_date column 2019-04-11 21:37:24 +04:00
ASH
5eae7305c4 codestyle 2019-04-11 00:14:03 +04:00
ASH
f019806a8e fixing adding and db everything added except tags 2019-04-10 23:57:55 +04:00
T-Midnight
e8461e26eb fix birthDate and degree to User 2019-04-10 10:09:41 +04:00
T-Midnight
51c755ac07 method hasErrors didn't work, return to the previous state 2019-04-10 09:39:07 +04:00
ASH
9b697c6f3f adding models, controllers and services 2019-04-09 23:18:39 +04:00
T-Midnight
e2e10477ac delete GrantStatusDto 2019-04-09 21:31:23 +04:00