Commit Graph

936 Commits

Author SHA1 Message Date
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
Artem.Arefev
53307c6add #95 init 2019-05-31 22:42:59 +04:00
Artem.Arefev
a405267092 merged with dev 2019-05-31 22:42:19 +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
Artem.Arefev
e680aa30c4 #112 ping activity 2019-05-31 00:33:21 +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
Artem.Arefev
a35bcfce1b #112 merged with dev 2019-05-27 22:47:01 +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
Artem.Arefev
482e2b3595 #112 base ping activities 2019-05-27 00:42:43 +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
Anton Romanov
0cd3055176 #120 disable tests 2019-05-25 21:33:06 +04:00
Anton Romanov
280c39dae4 #120 fix variable 2019-05-25 21:32:20 +04:00
Anton Romanov
828d320e0f #120 try to run test in docker 2019-05-25 21:16:26 +04:00
Anton Romanov
678397e970 #120 test classes refactor 2019-05-25 21:15:54 +04:00
Anton Romanov
916bbae414 #120 add debug email 2019-05-25 21:15:21 +04:00
Anton Romanov
477a9fd6ff #120 move to service 2019-05-25 15:48:32 +04:00
Anton Romanov
59d6edb818 #120 refactor 2019-05-25 15:42:08 +04:00
Artem.Arefev
f4479c2ab7 #91 fixed app properties 2019-05-25 14:11:57 +04:00
Artem.Arefev
193b2b3a32 #91 using RestTemplate & show error on timetable loading exception 2019-05-25 14:03:43 +04:00
Anton Romanov
837a9f465c #120 merge dev 2019-05-25 12:39:44 +04:00
Anton Romanov
eba3592410 Merge branch '127-paper-references' into 'dev'
Resolve "Ведение списка литературы статей"

Closes #127

See merge request romanov73/ng-tracker!108
2019-05-24 19:43:27 +00:00
Семенова Мария
22195813ae #127 fixes 2019-05-24 16:15:38 +04:00
Семенова Мария
43e7b9fe1f Merge branch 'dev' into 127-paper-references 2019-05-24 16:14:02 +04:00
Anton Romanov
308da4113d fix week number calculation 2019-05-24 13:26:02 +04:00