Commit Graph

493 Commits

Author SHA1 Message Date
T-Midnight
99ec7af319 #121 reduce paper title 2019-05-12 15:30:09 +04:00
T-Midnight
e1907d3169 #121 change Paper to PaperDto in attaching papers 2019-05-12 15:28:47 +04: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
Семенова Мария
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
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
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
T-Midnight
1f6d15b74b #38 create changelogs 2019-04-30 23:55:31 +04:00
T-Midnight
a69a257f09 #38 add styles 2019-04-30 23:43:47 +04:00
T-Midnight
6442a67ff1 #38 update view 2019-04-30 23:41:51 +04:00
T-Midnight
2ebd61016d #38 add variable "files" 2019-04-30 23:40:40 +04:00
Nightblade73
0e062f1337 #70 fast fix 2019-04-30 11:41:36 +04:00
Nightblade73
9edcf35338 #70 added ping notification 2019-04-30 10:43:36 +04:00
Васин Антон
5c677a975c #114 changelog edited 2019-04-30 01:01:30 +03:00
Nightblade73
0e8752e460 #70 style fixes 2019-04-27 20:34:49 +04:00
Nightblade73
e178cd1639 #70 added checking empty fields of deadline, fix bug on EventDto 2019-04-27 09:45:47 +04:00
T-Midnight
9cf002ad95 Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users 2019-04-26 15:22:04 +04:00
T-Midnight
39f3c69479 #117 add scopus papers filter 2019-04-26 15:16:04 +04:00
Nightblade73
dbcdb96dbf #70 added event method, don't work, because trying to find null entity 2019-04-26 15:12:34 +04:00
Семенова Мария
a8fbf98d85 #118 check if next deadline present 2019-04-26 10:37:50 +04:00
Nightblade73
51877023d1 #70 added new column to event 2019-04-26 09:28:20 +04:00
T-Midnight
51e121ae24 #117 add BAK papers filter 2019-04-26 00:29:20 +04:00
Семенова Мария
8f3e3fd9a7 #108 add formatting methods 2019-04-26 00:00:01 +04:00
Семенова Мария
71ec7bb726 #108 add reference dto 2019-04-25 22:08:24 +04:00
Nightblade73
34925b81ff #70 added schedule for deadline of conference 2019-04-25 21:17:48 +04:00
Nightblade73
16e9bf1fb5 #70 added update notification for all participants 2019-04-25 19:15:19 +04:00
Nightblade73
c489ebbf91 #70 added create notification for all users about new conference 2019-04-25 17:12:39 +04:00
Anton Romanov
88ec35faa0 Merge branch '68-ping-conf' into 'dev'
Resolve "Ping конференции в списке конференций"

Closes #68

See merge request romanov73/ng-tracker!69
2019-04-25 10:00:34 +00:00