Commit Graph

191 Commits

Author SHA1 Message Date
T-Midnight
97d7d00098 #42 merge with dev 2019-04-17 13:30:14 +04:00
T-Midnight
1e6b3cba3a #42 delete blank lines, fix js, fix leaderId validation 2019-04-17 13:25:10 +04:00
Nightblade73
81d07645c2 #65 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 #78 and #74

See merge request romanov73/ng-tracker!47
2019-04-16 09:36:58 +00:00
Anton Romanov
d81d1cf72c #74 some code fixes 2019-04-16 13:41:10 +04:00
Nightblade73
d4b38d314f #66 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 #66 added handling of adding articles not added to the picker. 2019-04-16 10:42:40 +04:00
Nightblade73
fbf9a7943b #66 changed from Set to List 2019-04-16 09:51:31 +04:00
Nightblade73
909c657c89 #58 added delete confirm 2019-04-15 15:48:17 +04:00
Nightblade73
0cc8de2d32 #58 added delete method of conference 2019-04-15 10:36:55 +04:00
Nightblade73
f88f035e65 #55 little fix 2019-04-14 21:34:39 +04:00
Nightblade73
8cfc64ea85 #55 added delete input style 2019-04-14 20:42:11 +04:00
ASH
d6a11a5902 #74 fixing codestyle and tags 2019-04-14 17:50:23 +04:00
Anton Romanov
8b2a559d37 #42 fix thymeleaf expressions 2019-04-13 23:56:24 +04:00
Anton Romanov
34499abd60 #62 fix remove deadline in other JPA operation 2019-04-13 22:59:59 +04:00
Nightblade73
9711febefb #55 added delete deadline 2019-04-13 13:02:36 +04:00
T-Midnight
1756f29505 #42 filter authors by leader and degree 2019-04-13 12:39:53 +04:00
Nightblade73
b4a2a8086d #62 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 #42 this don't work 2019-04-11 21:42:28 +04:00
T-Midnight
f7d766f02d #42 rename birth_date column 2019-04-11 21:37:24 +04:00
ASH
5eae7305c4 #74 codestyle 2019-04-11 00:14:03 +04:00
ASH
f019806a8e #74 fixing adding and db everything added except tags 2019-04-10 23:57:55 +04:00
T-Midnight
e8461e26eb #42 fix birthDate and degree to User 2019-04-10 10:09:41 +04:00
T-Midnight
51c755ac07 #42 method hasErrors didn't work, return to the previous state 2019-04-10 09:39:07 +04:00
ASH
9b697c6f3f #74 adding models, controllers and services 2019-04-09 23:18:39 +04:00
T-Midnight
e2e10477ac #42 delete GrantStatusDto 2019-04-09 21:31:23 +04:00
Nightblade73
c308a5e5af #55 Navigation's method "hasErrors" don't work. it returns String, not redirection. 2019-04-09 14:47:14 +04:00
Nightblade73
689a7799e3 #55 added method in controller 2019-04-08 22:04:30 +04:00
Anton Romanov
7dca991c2f Merge branch '55-new-conf' into 'dev'
Resolve "Добавление новой конференции"

Closes #55

See merge request romanov73/ng-tracker!43
2019-04-08 03:33:40 +00:00
Anton Romanov
e350f8b3c1 #55 refactor controller navigation, fix conference edit url 2019-04-08 07:40:26 +04:00
Nightblade73
c49b56916c #55 added initialization of fields in ConferenceDto 2019-04-07 10:08:13 +04:00
Nightblade73
db43da9ec0 #55 added nav controller 2019-04-07 10:01:44 +04:00
Nightblade73
3e5aeaf290 #55 fast fixes 2019-04-06 14:41:10 +04:00
Nightblade73
926cd02096 #55 fixed adding to DB 2019-04-06 11:05:30 +04:00
T-Midnight
7465803162 #42 add columns 'birth_date'&'degree' to User 2019-04-05 22:06:16 +04:00
Anton Romanov
e0ca29fbab #83 fix wrong entity 2019-04-05 21:47:42 +04:00
Nightblade73
eb524d49d0 #55 added html side, don't work, because can't parse date, like in deadlines 2019-04-05 18:01:43 +04:00
Anton Romanov
72add3638b #83 check CI 2019-04-05 18:01:12 +04:00
Anton Romanov
c7cdbe9044 #83 add tasks, modify build script for passing application properties 2019-04-05 17:35:17 +04:00
Nightblade73
67bfad22f9 #55 added create and update methods 2019-04-05 16:30:45 +04:00
Anton Romanov
54edeb0559 #82 fix user abbreviate 2019-04-05 13:39:53 +04:00
Anton Romanov
91d2168012 #82 show paper formatted lines 2019-04-05 13:34:38 +04:00
Nightblade73
d6b7fe790a #55 added transition to the page new conference 2019-04-05 13:21:15 +04:00
Nightblade73
9d69f75530 #55 fixes 2019-04-04 20:26:38 +04:00
Nightblade73
2d04b1b43a #55 added findAll method in ConferenceService 2019-04-04 17:58:22 +04:00
Nightblade73
d189891e8c #55 added ConferenceFilterDto 2019-04-04 17:47:18 +04:00