Commit Graph

906 Commits

Author SHA1 Message Date
Васин Антон
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
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
Семенова Мария
29cfadef02 #127 reference model, schema 2019-05-23 15:02:55 +04:00
ASH
ef521123dd #104 mod tests check repeatings 2019-05-23 14:31:34 +04:00
Anton Romanov
82ae42f7fc Merge branch '125-bug-date-conf' into 'dev'
Resolve "Bug: ошибка при попытке сохранить конференцию с невыбранными датами"

Closes #125

See merge request romanov73/ng-tracker!103
2019-05-23 09:56:21 +00:00
Anton Romanov
af09938e66 Merge branch '103-students-integ-tests' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!100
2019-05-23 09:50:30 +00:00
Anton Romanov
1c8359f900 #103 modify files permissions 2019-05-23 13:54:44 +04:00
T-Midnight
47131f1fb7 #103 add tests for papers 2019-05-23 13:43:18 +04:00
ASH
284a3f51e9 #104 mod tests filter and create tasks 2019-05-23 12:07:34 +04:00
ASH
bd24525315 #103 integration tests 2019-05-23 00:15:03 +04:00
T-Midnight
3e9bbb3584 #103 create tests for create, update and delete functions 2019-05-22 23:15:04 +04:00
T-Midnight
16885cc94f #103 update overriding method 2019-05-22 23:12:30 +04:00
T-Midnight
b1c090b0ea #103 add selenium-support library 2019-05-22 23:11:06 +04:00
T-Midnight
ecda92326b #103 create blank classes 2019-05-22 16:04:51 +04:00
T-Midnight
457f1da985 #120 fix checkRun and checkStyle 2019-05-22 15:45:23 +04:00
T-Midnight
5f214620bf #120 use loading from kias 2019-05-22 15:16:20 +04:00
T-Midnight
c21739bfc6 #120 parse kias page 2019-05-22 15:12:45 +04:00
T-Midnight
bab621677e #120 add methods for checking unique title and date of grant 2019-05-22 15:10:51 +04:00