Commit Graph

750 Commits

Author SHA1 Message Date
Anton Romanov
d84b1fcbdc use HtmlUnit instead of selenium webdriver for grants loading 2019-06-08 14:36:12 +04:00
Anton Romanov
b44bbaec75 Merge branch '95-block-user' into 'dev'
Resolve "Блокировка пользователя"

Closes #95

See merge request romanov73/ng-tracker!110
2019-06-08 08:29:44 +00:00
T-Midnight
e4f5bede2a #104 add 3 more tests 2019-06-07 22:39:20 +04:00
T-Midnight
888fecf687 #104 add unit tests 2019-06-07 20:55:59 +04:00
T-Midnight
51ed732ae8 #104 fix web element in integration test 2019-06-07 20:54:38 +04:00
Anton Romanov
18bb0b85ac sout driver path 2019-06-07 15:53:09 +04:00
Anton Romanov
615c70d12a sout driver path 2019-06-07 15:35:15 +04:00
Artem.Arefev
96d166d031 #95 block user html 2019-06-07 12:23:03 +04:00
Artem.Arefev
fb23f182de #95 merged with dev 2019-06-07 11:39:44 +04:00
Anton Romanov
f8c1e52ca4 add kias loader to rest 2019-06-07 09:48:07 +04:00
Anton Romanov
59e52aaf4a different drivers 2019-06-06 17:07:25 +04:00
Artem.Arefev
019ac6e0ad #112 fix ping authors in grant 2019-06-06 00:21:19 +04:00
Artem.Arefev
4104844b1e #95 merged with dev 2019-06-06 00:01:03 +04:00
Artem.Arefev
c0afabc37c #112 merged with dev 2019-06-05 23:57:33 +04:00
T-Midnight
fddc15af5a #103 add tests for authors and description 2019-06-05 23:14:52 +04:00
Artem.Arefev
bdb8fd8ce4 Merge remote-tracking branch 'origin/dev' into 112-ping-stats 2019-06-05 18:12:38 +04:00
T-Midnight
acd58005de #103 merge with 44 2019-06-05 15:52:29 +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
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
Artem.Arefev
22abf6a27d #95 blocking user 2019-06-03 02:11:35 +04:00
Artem.Arefev
abea3c7dad #112 ping model changed 2019-06-02 21:53:51 +04: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
Artem.Arefev
3898dcf1c1 #112 changed mapping 2019-06-01 12:57:20 +04:00
Artem.Arefev
2d230afa35 #112changed mapping 2019-06-01 12:56:37 +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
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
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
Васин Антон
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
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
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
Семенова Мария
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
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
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