321 Commits

Author SHA1 Message Date
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
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
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
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
Artem.Arefev
a405267092 merged with dev 2019-05-31 22:42:19 +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
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
Васин Антон
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
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
Artem.Arefev
193b2b3a32 #91 using RestTemplate & show error on timetable loading exception 2019-05-25 14:03:43 +04:00
Семенова Мария
43e7b9fe1f Merge branch 'dev' into 127-paper-references 2019-05-24 16:14:02 +04: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
Семенова Мария
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
Семенова Мария
7c1b124c94 #127 references tab, crud 2019-05-23 15:48:46 +04:00
Nightblade73
8b52518c4a #125 check method 2019-05-21 15:53:42 +04:00
Artem.Arefev
d7c4e6b222 #91 base users dashboard 2019-05-21 02:09:07 +04:00
Artem.Arefev
90799356ab 89 password reset 2019-05-19 00:42:24 +04:00
Artem.Arefev
532e007b0b 87 merged with dev 2019-05-17 14:31:08 +04:00
Anton Romanov
3dbf635fb6 Merge branch '88-change-password' into 'dev'
Resolve "Смена пароля"

Closes #88

See merge request romanov73/ng-tracker!96
2019-05-17 10:23:24 +00:00
Artem.Arefev
7163937a53 87 using showFeedBackMessage 2019-05-17 12:20:08 +04:00
Васин Антон
097f7827b0 #98 db edited 2019-05-17 10:30:34 +03:00
Anton Romanov
83aba158b6 Merge branch '104-module-test-conf' into 'dev'
Resolve "Реализовать модульные тесты"

See merge request romanov73/ng-tracker!92
2019-05-17 07:27:21 +00:00
Artem.Arefev
6a62e61caf 87 error handling + ajax + rest 2019-05-17 04:34:03 +04:00
Artem.Arefev
052e4a1aef 88 rest changePassword + ajax 2019-05-17 03:55:22 +04:00
Artem.Arefev
4fc8bc3717 Merge branch '87-inviting-user' into 88-change-password 2019-05-17 02:01:56 +04:00