Commit Graph

280 Commits

Author SHA1 Message Date
Anton Romanov
993a034527 #73 restore authentication 2019-03-20 20:32:10 +04:00
Anton Romanov
9bd954ea9b #73 fix new thymeleaf syntax 2019-03-20 20:31:46 +04: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
Anton Romanov
c374cb4232 merge deploy environments 2019-03-18 22:35:01 +04:00
Anton Romanov
d35e0f7ba3 add environment 2019-03-18 22:25:28 +04:00
Anton Romanov
9418a47a1d Merge branch '50-refactorForGrants' into 'dev'
Resolve "Тех. долг: отрефакторить контроллеры и модели"

Closes #50

See merge request romanov73/ng-tracker!32
2019-03-18 11:08:15 +00:00
T-Midnight
29df7120bf Delete DeadlineDTO and update usages 2019-03-18 14:27:54 +04:00
T-Midnight
99d85a5648 Add new status for grant 2019-03-15 12:24:02 +04:00
T-Midnight
c25c17d8ba Rename title 2019-03-15 12:19:25 +04:00
T-Midnight
de96be2471 Create Navigation class to avoid "magic strings" and code duplication 2019-03-15 12:19:01 +04:00
Anton Romanov
ae58a5b6e4 Merge branch '72-link-to-timetable' into 'dev'
Resolve "Ссылка на расписание пользователя"

Closes #72

See merge request romanov73/ng-tracker!31
2019-03-13 07:16:32 +00:00
Anton Romanov
90bb94d864 add patronymic 2019-03-12 14:44:11 +04:00
Anton Romanov
48894b2176 display user in filter 2019-03-12 13:40:48 +04:00
Anton Romanov
da7a17ee49 add service methods 2019-03-12 12:51:59 +03:00
Anton Romanov
20ecb47867 add timetable link 2019-03-12 12:35:09 +03:00
Anton Romanov
3169551968 Merge branch '54-view-conference' into 'dev'
Resolve "Вёрстка страницы просмотра информации о конференции"

Closes #54

See merge request romanov73/ng-tracker!26
2019-03-11 10:49:07 +00:00
Nightblade73
5cb865eb70 #54 deleted edit btn 2019-03-11 14:43:32 +04:00
Nightblade73
2fec35264c #54 add back link, css fixes 2019-03-11 12:58:40 +04:00
Nightblade73
f90d92b19d #54 add custom paper-list 2019-03-11 11:36:00 +04:00
Nightblade73
d332282e03 #54 add custom deadline-list, add edit-button, add edit and delete icons 2019-03-10 22:15:09 +04:00
Nightblade73
7fff337c3a #54 add member list 2019-03-07 22:50:37 +04:00
Nightblade73
76ec5add30 #54 part of make-up 2019-03-06 20:51:46 +04:00
Nightblade73
c21a65a075 #54 add transitions 2019-03-06 16:48:51 +04:00
Anton Romanov
42fdb51337 fix login 2019-03-06 16:40:33 +04:00
Nightblade73
93e68b1929 #50 creating html page, changing href 2019-03-06 16:27:25 +04:00
Anton Romanov
febdb0b027 Merge branch '29-page-header' into 'dev'
Resolve "Адаптивный заголовок на странице"

Closes #29

See merge request romanov73/ng-tracker!28
2019-03-06 12:25:34 +00:00
Anton Romanov
cb73340c3f fix css 2019-03-06 16:19:43 +04:00
Anton Romanov
4226be6406 fix props 2019-03-06 14:36:46 +03:00
Anton Romanov
dd90bd24a9 fix props 2019-03-06 14:35:09 +03:00
user
285b43c63c header fix 2019-03-06 14:25:02 +03:00
Anton Romanov
4f47b1beb6 fix code 2019-03-04 10:28:46 +04:00
Anton Romanov
e2c12d9fb2 fix code 2019-03-04 10:24:30 +04:00
Anton Romanov
3d8e8ca4f2 fix branch 2019-03-01 11:27:57 +04:00
Anton Romanov
0fccbdc973 add links to papers 2019-03-01 11:22:25 +04:00
Anton Romanov
39c25c7b20 add links to papers 2019-03-01 11:21:25 +04:00
Anton Romanov
a997f5fffa Update README.md 2019-02-03 14:54:02 +00:00
Anton Romanov
c00390a17b filter dashboard papers 2019-01-17 01:01:26 +04:00
Anton Romanov
779bc3eafc fix failed conditions 2019-01-17 00:57:34 +04:00
Anton Romanov
c17591bf10 Update README.md 2019-01-08 19:55:27 +00:00
Anton Romanov
a18400a97c Update README.md 2019-01-08 19:36:36 +00:00
Anton Romanov
ffb3c65118 fix notifications 2019-01-05 08:01:07 +04:00
Anton Romanov
eab71c1210 fix notifications 2019-01-04 17:41:48 +04:00
Anton Romanov
cec13bb677 some layout fix 2018-12-30 19:23:11 +04:00
Anton Romanov
edc9c7c090 sort deadlines 2018-12-30 19:22:51 +04:00
Anton Romanov
2cac98be50 fix enum field name 2018-12-29 09:58:37 +04:00
Anton Romanov
7a490ef7a5 Merge branch '35-' into 'master'
Resolve "Создать контроллер грантов"

Closes #35

See merge request romanov73/ng-tracker!24
2018-12-28 10:04:42 +00:00
Anton Romanov
ebb036ee71 some refactor 2018-12-28 14:00:09 +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