Commit Graph

827 Commits

Author SHA1 Message Date
Artem.Arefev
e81ee4d36b #93 codestyle 2019-06-11 01:20:34 +04:00
Artem.Arefev
cbae48c23e #93 users activities analytycs 2019-06-11 01:18:49 +04:00
Artem.Arefev
015a1d7fb8 #93 merged with dev 2019-06-09 01:54:21 +04:00
Artem.Arefev
0bb9d5771f #93 merged with dev 2019-06-09 01:53:01 +04:00
Anton Romanov
9ba4476f80 restore dependencies 2019-06-08 14:43:08 +04:00
Anton Romanov
098f70ede6 Merge remote-tracking branch 'origin/dev' into dev 2019-06-08 14:37:07 +04:00
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
Anton Romanov
436c15e727 Merge branch '104-module-tests-grant' into 'dev'
Resolve "Реализовать модульные тесты"

See merge request romanov73/ng-tracker!115
2019-06-08 06:02:09 +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
a28b3ea57b #93 resolve stashed conflicts 2019-06-07 12:46:27 +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
Anton Romanov
dc467ec72c Merge branch '112-ping-stats' into 'dev'
#112 fix ping authors in grant

Closes #112

See merge request romanov73/ng-tracker!114
2019-06-05 20:28:47 +00:00
Artem.Arefev
019ac6e0ad #112 fix ping authors in grant 2019-06-06 00:21:19 +04:00
Anton Romanov
1ccec83390 Merge branch '112-ping-stats' into 'dev'
Resolve "Сводка по ping активностей"

Closes #112

See merge request romanov73/ng-tracker!109
2019-06-05 20:04:44 +00: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
Anton Romanov
624573a47a Merge branch '103-integr-tests-grant' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!106
2019-06-05 19:46:59 +00: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
Artem.Arefev
9bec1d080d #93 completed count 2019-06-05 11:55:51 +04:00
Artem.Arefev
44e3fc2c6e #93 fixes 2019-06-05 11:25:33 +04:00
Artem.Arefev
2adaf7740a #93 removed comment 2019-06-05 10:55:12 +04:00
Artem.Arefev
ed7707c4d8 #93 users activity by date 2019-06-05 10:53:30 +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
Artem.Arefev
ea0b8fbaad Merge remote-tracking branch 'origin/dev' into 93-activites-analytics 2019-06-03 02:14:26 +04: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