Commit Graph

795 Commits

Author SHA1 Message Date
T-Midnight
858b4b96a7 Merge remote-tracking branch 'origin/44-check-complete-deadlines' into 44-check-complete-deadlines
# Conflicts:
#	src/main/resources/templates/papers/fragments/paperLineFragment.html
2019-06-05 11:55:31 +04:00
T-Midnight
8b263e7e0f #44 fix link to papers 2019-06-05 11:52:54 +04:00
T-Midnight
24d3c2ef69 Merge branch '103-integr-tests-grant' into 44-check-complete-deadlines 2019-06-05 10:47:52 +04:00
T-Midnight
1ff38fc80e #103 merge with dev 2019-06-05 09:36:29 +04:00
T-Midnight
c77702704f #103 merge with dev 2019-06-05 09:34:51 +04:00
Anton Romanov
44824e53b2 Merge branch '103-paper-integr-tests' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!111
2019-06-05 04:57:33 +00:00
Anton Romanov
bacd3827e3 Merge branch '101-projecgt-timeline' into 'dev'
Resolve "Генерация таймлайна для проекта"

Closes #101

See merge request romanov73/ng-tracker!85
2019-06-05 04:55:15 +00:00
T-Midnight
0cd8003dd7 #103 add tests for deadline 2019-06-04 16:26:42 +04:00
Васин Антон
bdff81d25e #101 tests edited 2019-06-03 20:42:49 +03:00
Васин Антон
482964fe53 #101 EventService edited 2019-06-03 20:21:46 +03:00
Васин Антон
dc52968ddf Merge branch '101-projecgt-timeline' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline 2019-06-03 14:40:09 +03:00
Семенова Мария
23d4e5602f #103 integration auto tests 2019-06-01 23:16:39 +04:00
a.vasin
bde4ac5f1c #101 event service edited 2019-06-01 13:25:12 +04:00
a.vasin
db3252d822 #101 event service edited 2019-06-01 12:55:13 +04:00
a.vasin
e6dc2abdd9 #101 event service edited 2019-06-01 12:23:52 +04:00
a.vasin
ae8dc58a9d #101 event service edited 2019-06-01 12:16:59 +04:00
a.vasin
38478835fb #101 event service edited 2019-06-01 12:03:42 +04:00
a.vasin
7edb9d2aa3 #101 event service edited 2019-06-01 11:56:38 +04:00
a.vasin
961a6a318e #101 event service edited 2019-06-01 11:51:01 +04:00
a.vasin
267bd5b0f3 #101 event service edited 2019-06-01 11:44:41 +04:00
a.vasin
a5ac2bcbc2 Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline 2019-06-01 09:44:46 +04:00
a.vasin
291f4e1e33 #101 db edited 2019-06-01 09:44:25 +04:00
Васин Антон
1224cc7a23 Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline 2019-05-31 16:04:01 +03:00
Anton Romanov
a878f8c22c fix remove older events 2019-05-31 09:06:21 +04:00
Anton Romanov
d2ce6d604e fix merging collection 2019-05-31 08:46:21 +04:00
Anton Romanov
b4b7b9087e fix npe 2019-05-31 08:12:57 +04:00
a.vasin
a7b48e1534 #101 project tests 2019-05-31 02:23:15 +04:00
a.vasin
9388302a47 #101 project tests 2019-05-31 01:08:40 +04:00
a.vasin
4498b71259 #101 project tests 2019-05-30 09:53:27 +04:00
a.vasin
632c6299b7 #101 files attach modified 2019-05-30 00:08:13 +04:00
a.vasin
9013d79228 #101 grant attach 2019-05-29 23:40:30 +04:00
a.vasin
192adbfa0b #101 no projects message 2019-05-29 18:40:14 +04:00
a.vasin
eb30d07d10 #101 project deadlines on timeline 2019-05-29 18:27:34 +04:00
a.vasin
eceb8ec528 #101 project model edited 2019-05-29 17:52:15 +04:00
Anton Romanov
330ffc4df1 Merge branch '98-project-tasks' into 'dev'
Resolve "Задачи проекта"

Closes #98

See merge request romanov73/ng-tracker!74
2019-05-29 04:56:30 +00:00
Васин Антон
77ce908d58 #98 deadline edited 2019-05-28 16:55:08 +03:00
Васин Антон
8ffafd6693 #98 deadline imports edited 2019-05-28 16:46:12 +03:00
Васин Антон
e967e2bfee Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into 98-project-tasks 2019-05-28 16:17:37 +03:00
Васин Антон
c25392337a #98 project deadlines edited 2019-05-28 16:16:41 +03:00
a.vasin
3b0a2dd964 #98 executors list added 2019-05-28 11:12:27 +04:00
a.vasin
8d1e410e83 Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 98-project-tasks 2019-05-28 00:41:15 +04:00
a.vasin
eb87c6d52f #98 project statuses edited 2019-05-28 00:40:36 +04:00
Anton Romanov
6258e7b6bf Merge branch '91-users-info' into 'dev'
Resolve "Сводка по пользователям"

Closes #91

See merge request romanov73/ng-tracker!99
2019-05-27 18:03:41 +00:00
Artem.Arefev
c4b35ddf6a #91 merged with dev 2019-05-27 21:53:55 +04:00
Васин Антон
7388e12e3f #98 edited project executors 2019-05-27 18:19:31 +03:00
Васин Антон
4bb4fd6bca #98 changelog edited 2019-05-27 09:35:58 +03:00
Васин Антон
4eeb79ab80 #98 changelog edited 2019-05-27 09:19:52 +03:00
Anton Romanov
336a16ff73 some refactor 2019-05-27 09:14:24 +04:00
Artem.Arefev
0e7fdac980 Merge remote-tracking branch 'origin/dev' into 91-users-info 2019-05-27 00:42:54 +04:00
Anton Romanov
2b911017b1 Merge branch '120-kias' into 'dev'
Resolve "Загрузка грантов в сайта kias"

Closes #120

See merge request romanov73/ng-tracker!94
2019-05-25 17:40:59 +00:00