Commit Graph

599 Commits

Author SHA1 Message Date
Nightblade73
1f8722e3ff #103 code refactoring 2019-05-13 20:13:53 +04:00
Nightblade73
451e7e5d04 #103 fix code style 2019-05-12 13:50:46 +04:00
Nightblade73
5cbbb6c319 #103 fix code style 2019-05-12 13:49:49 +04:00
Nightblade73
70062992ae #103 clear code 2019-05-12 13:45:17 +04:00
Nightblade73
fe53c86136 #103 fixed delete conf test 2019-05-12 13:42:50 +04:00
Nightblade73
b2e8a43cee #103 delete conf test 2019-05-11 00:51:57 +04:00
Nightblade73
3f32a61ed2 Merge remote-tracking branch 'origin/103-autotest-conf' into 103-autotest-conf
# Conflicts:
#	src/test/java/IndexConferenceTest.java
2019-05-10 23:38:54 +04:00
Nightblade73
6edcf8f594 #103 add sort and filter test, fixed delete conference, if it has fk with event 2019-05-10 23:36:07 +04:00
Nightblade73
4686406954 #103 add undock article 2019-05-10 21:15:49 +04:00
Nightblade73
4e4e7ae194 #103 add paper transition 2019-05-10 20:54:43 +04:00
Nightblade73
cad8682088 #103 add adding article 2019-05-10 20:07:55 +04:00
Nightblade73
d9a4224317 #103 add attach article 2019-05-10 19:15:22 +04:00
Nightblade73
7b4318a3b5 #103 add delete deadline 2019-05-10 17:40:24 +04:00
Nightblade73
0cb7b05c25 #103 add check take part 2019-05-10 17:21:36 +04:00
Nightblade73
253f4b4aad #103 add check new deadline 2019-05-10 17:03:47 +04:00
Nightblade73
1ad66d6fb1 #103 change name method test 2019-05-10 15:54:12 +04:00
Nightblade73
961fdf9397 #70 added conference class, added create method test 2019-05-10 15:07:47 +04:00
Anton Romanov
ff7f535980 Merge branch '119-notification-grants' into 'dev'
Resolve "Реализовать уведомления на почту"

Closes #119

See merge request romanov73/ng-tracker!84
2019-05-09 04:18:55 +00:00
T-Midnight
77e2ad0651 #119 add send notification functions 2019-05-09 01:24:55 +04:00
T-Midnight
74a8dcbd8a #119 add leader changed notification 2019-05-09 01:23:17 +04:00
T-Midnight
4262446aef #119 create all mail templates 2019-05-09 01:21:56 +04:00
T-Midnight
b640dea99a #119 create scheduler 2019-05-09 00:45:54 +04:00
T-Midnight
2d9fd05060 #119 create grantCreateNotification mail template 2019-05-08 23:32:37 +04:00
T-Midnight
e3ad5ba510 Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants 2019-05-08 16:22:39 +04:00
Anton Romanov
09aa3d0084 Merge branch '122-bug-leader-grants' into 'dev'
Resolve "Bug: не отображается cписок грантов"

Closes #122

See merge request romanov73/ng-tracker!88
2019-05-08 09:25:37 +00:00
Anton Romanov
662847698e Merge branch '109-paper-attach-control' into 'dev'
Resolve "Контроль прикрепления статей"

Closes #109

See merge request romanov73/ng-tracker!87
2019-05-08 09:10:03 +00:00
Семенова Мария
2fba252df0 #109 show other paper attachs 2019-05-07 23:53:10 +04:00
T-Midnight
7ffe04f1db #122 move to right directory 2019-05-07 22:47:27 +04:00
T-Midnight
d244437858 #122 fix bug 2019-05-07 22:35:44 +04:00
T-Midnight
934d194df1 #119 gelete unnecessary column 2019-05-07 22:15:49 +04:00
Семенова Мария
1e07c5424d #109 only one conference for paper 2019-05-07 21:35:50 +04:00
Семенова Мария
dffd839905 #109 only uncompleted for grant 2019-05-07 20:26:49 +04:00
T-Midnight
2dae39a100 #119 create grants notification service 2019-05-06 23:57:16 +04:00
Anton Romanov
2dff183662 Merge branch '32-timeline-grants' into 'dev'
Resolve "Создать страницу таймлайна дедлайнов"

Closes #32

See merge request romanov73/ng-tracker!83
2019-05-06 07:06:04 +00:00
T-Midnight
da382b659a #32 add deadlines on timeline page 2019-05-06 00:32:28 +04:00
T-Midnight
114f6769ac #32 create changelog 2019-05-05 23:54:02 +04:00
T-Midnight
beb334f2fa #32 add variable "events" 2019-05-04 23:59:03 +04:00
Anton Romanov
68737b976f Merge branch '117-filter-users' into 'dev'
Resolve "Фильтрация участников гранта по двум новым параметрам"

Closes #117

See merge request romanov73/ng-tracker!77
2019-05-03 05:58:19 +00:00
Anton Romanov
6eed8591b4 Merge branch '70-notification-conf' into 'dev'
Resolve "Оповещения о дедлайнах конференции"

Closes #70

See merge request romanov73/ng-tracker!76
2019-05-03 05:56:33 +00:00
T-Midnight
74d43dcd0d #117 resolve last discussion 2019-05-02 22:49:58 +04:00
T-Midnight
0955388f27 #117 fix port 2019-05-02 22:00:53 +04:00
T-Midnight
de625923e9 #117 resolve discussions v.2 2019-05-02 21:56:54 +04:00
T-Midnight
b334b5d70e #117 resolve discussions 2019-05-02 21:42:06 +04:00
T-Midnight
8b333ab3a6 Merge branch '38-attach-file-grants' into 117-filter-users 2019-05-02 21:29:20 +04:00
Nightblade73
6350e1c0d6 #70 add hashCode for deadline 2019-05-02 14:51:22 +04:00
Nightblade73
6820c617f3 #70 remove conflicts 2019-05-02 14:42:08 +04:00
Nightblade73
60bdd9d233 #70 fixes 2019-05-02 14:35:40 +04:00
T-Midnight
c8cfde67a9 Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants 2019-05-01 00:21:56 +04:00
Anton Romanov
a6f2177179 Merge branch '114-bug-projects-list' into 'dev'
Resolve "Bug: не отображается список проектов"

Closes #114

See merge request romanov73/ng-tracker!82
2019-04-30 20:12:51 +00:00
T-Midnight
1f6d15b74b #38 create changelogs 2019-04-30 23:55:31 +04:00