ASH
|
7798508d4f
|
Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
# src/main/resources/db/changelog-20190505_000000-schema.xml
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
ASH
|
c59bb45c70
|
#79 fixing codestyle
|
5 years ago |
|
ASH
|
0de34c89fe
|
#79 fixing planner and year generation
|
5 years ago |
Anton Romanov
|
ff7f535980
|
Merge branch '119-notification-grants' into 'dev'
Resolve "Реализовать уведомления на почту"
Closes #119
See merge request romanov73/ng-tracker!84
|
5 years ago |
T-Midnight
|
77e2ad0651
|
#119 add send notification functions
|
5 years ago |
|
T-Midnight
|
74a8dcbd8a
|
#119 add leader changed notification
|
5 years ago |
|
T-Midnight
|
4262446aef
|
#119 create all mail templates
|
5 years ago |
|
T-Midnight
|
b640dea99a
|
#119 create scheduler
|
5 years ago |
|
T-Midnight
|
2d9fd05060
|
#119 create grantCreateNotification mail template
|
5 years ago |
|
T-Midnight
|
e3ad5ba510
|
Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants
|
5 years ago |
|
Anton Romanov
|
09aa3d0084
|
Merge branch '122-bug-leader-grants' into 'dev'
Resolve "Bug: не отображается cписок грантов"
Closes #122
See merge request romanov73/ng-tracker!88
|
5 years ago |
|
Anton Romanov
|
662847698e
|
Merge branch '109-paper-attach-control' into 'dev'
Resolve "Контроль прикрепления статей"
Closes #109
See merge request romanov73/ng-tracker!87
|
5 years ago |
Семенова Мария
|
2fba252df0
|
#109 show other paper attachs
|
5 years ago |
|
T-Midnight
|
7ffe04f1db
|
#122 move to right directory
|
5 years ago |
|
T-Midnight
|
d244437858
|
#122 fix bug
|
5 years ago |
|
T-Midnight
|
934d194df1
|
#119 gelete unnecessary column
|
5 years ago |
|
Семенова Мария
|
1e07c5424d
|
#109 only one conference for paper
|
5 years ago |
|
Семенова Мария
|
dffd839905
|
#109 only uncompleted for grant
|
5 years ago |
|
T-Midnight
|
2dae39a100
|
#119 create grants notification service
|
5 years ago |
|
ASH
|
65dea9bce2
|
#79 adding task planer generation
|
5 years ago |
|
Anton Romanov
|
2dff183662
|
Merge branch '32-timeline-grants' into 'dev'
Resolve "Создать страницу таймлайна дедлайнов"
Closes #32
See merge request romanov73/ng-tracker!83
|
5 years ago |
|
T-Midnight
|
da382b659a
|
#32 add deadlines on timeline page
|
5 years ago |
|
T-Midnight
|
114f6769ac
|
#32 create changelog
|
5 years ago |
|
T-Midnight
|
beb334f2fa
|
#32 add variable "events"
|
5 years ago |
|
Anton Romanov
|
68737b976f
|
Merge branch '117-filter-users' into 'dev'
Resolve "Фильтрация участников гранта по двум новым параметрам"
Closes #117
See merge request romanov73/ng-tracker!77
|
5 years ago |
|
Anton Romanov
|
6eed8591b4
|
Merge branch '70-notification-conf' into 'dev'
Resolve "Оповещения о дедлайнах конференции"
Closes #70
See merge request romanov73/ng-tracker!76
|
5 years ago |
|
T-Midnight
|
74d43dcd0d
|
#117 resolve last discussion
|
5 years ago |
|
T-Midnight
|
0955388f27
|
#117 fix port
|
5 years ago |
|
T-Midnight
|
de625923e9
|
#117 resolve discussions v.2
|
5 years ago |
|
T-Midnight
|
b334b5d70e
|
#117 resolve discussions
|
5 years ago |
|
T-Midnight
|
8b333ab3a6
|
Merge branch '38-attach-file-grants' into 117-filter-users
|
5 years ago |
Nightblade73
|
6350e1c0d6
|
#70 add hashCode for deadline
|
5 years ago |
|
Nightblade73
|
6820c617f3
|
#70 remove conflicts
|
5 years ago |
|
Nightblade73
|
60bdd9d233
|
#70 fixes
|
5 years ago |
|
T-Midnight
|
c8cfde67a9
|
Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants
|
5 years ago |
|
Anton Romanov
|
a6f2177179
|
Merge branch '114-bug-projects-list' into 'dev'
Resolve "Bug: не отображается список проектов"
Closes #114
See merge request romanov73/ng-tracker!82
|
5 years ago |
|
T-Midnight
|
1f6d15b74b
|
#38 create changelogs
|
5 years ago |
|
T-Midnight
|
a69a257f09
|
#38 add styles
|
5 years ago |
|
T-Midnight
|
6442a67ff1
|
#38 update view
|
5 years ago |
|
T-Midnight
|
2ebd61016d
|
#38 add variable "files"
|
5 years ago |
|
ASH
|
7ce8b20841
|
#79 fixing bug
|
5 years ago |
|
Nightblade73
|
0e062f1337
|
#70 fast fix
|
5 years ago |
|
Nightblade73
|
9edcf35338
|
#70 added ping notification
|
5 years ago |
Васин Антон
|
5c677a975c
|
#114 changelog edited
|
5 years ago |
|
ASH
|
b4c11a7f90
|
#79 year generation
|
5 years ago |
|
Nightblade73
|
0e8752e460
|
#70 style fixes
|
5 years ago |
|
Nightblade73
|
e178cd1639
|
#70 added checking empty fields of deadline, fix bug on EventDto
|
5 years ago |
|
T-Midnight
|
9cf002ad95
|
Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users
|
5 years ago |
|
T-Midnight
|
39f3c69479
|
#117 add scopus papers filter
|
5 years ago |
|
Nightblade73
|
dbcdb96dbf
|
#70 added event method, don't work, because trying to find null entity
|
5 years ago |