Artem.Arefev
|
ed7707c4d8
|
#93 users activity by date
|
2019-06-05 10:53:30 +04:00 |
|
Artem.Arefev
|
ea0b8fbaad
|
Merge remote-tracking branch 'origin/dev' into 93-activites-analytics
|
2019-06-03 02:14:26 +04: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 |
|
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
|
d1182ea7c3
|
Merge remote-tracking branch 'origin/dev' into 93-activites-analytics
|
2019-05-27 02:12:22 +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 |
|
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 |
|
Anton Romanov
|
c9ecae9842
|
Merge branch '104-students-mod-tests' into 'dev'
Resolve "Реализовать модульные тесты"
See merge request romanov73/ng-tracker!107
|
2019-05-24 06:37:03 +00:00 |
|
Anton Romanov
|
d4364b9767
|
Merge branch '89-restore-password' into 'dev'
Resolve "Восстановление пароля"
Closes #89
See merge request romanov73/ng-tracker!101
|
2019-05-24 06:34:18 +00:00 |
|
Artem.Arefev
|
505a054cc8
|
Merge remote-tracking branch 'origin/dev' into 91-users-info
|
2019-05-24 01:53:54 +04:00 |
|
Artem.Arefev
|
8bb9e3a844
|
#89 jquery
|
2019-05-24 01:52:50 +04:00 |
|
Artem.Arefev
|
661da17f73
|
Merge remote-tracking branch 'origin/dev' into 89-restore-password
|
2019-05-24 01:36:01 +04:00 |
|
Семенова Мария
|
01bcac2680
|
#127 allow nullable year
|
2019-05-24 00:26:38 +04:00 |
|
Семенова Мария
|
421ed635e8
|
Merge branch 'dev' into 127-paper-references
|
2019-05-24 00:18:07 +04:00 |
|
Семенова Мария
|
24a1276005
|
#127 autocomplete
|
2019-05-24 00:14:46 +04:00 |
|
Семенова Мария
|
512a805e8c
|
#127 references formatting
|
2019-05-23 17:26:22 +04:00 |
|
ASH
|
ab17b9f152
|
#104 mod tests period task
|
2019-05-23 16:45:09 +04:00 |
|
Anton Romanov
|
181086c9db
|
#120 disable start browser on run application
|
2019-05-23 16:36:48 +04:00 |
|
ASH
|
82e454a50b
|
#104 mod tests generate task
|
2019-05-23 16:17:04 +04:00 |
|
Anton Romanov
|
c303d65c8d
|
#120 move to services
|
2019-05-23 16:02:44 +04:00 |
|
Семенова Мария
|
7c1b124c94
|
#127 references tab, crud
|
2019-05-23 15:48:46 +04:00 |
|