Commit Graph

667 Commits (1-audit-listener)
 

Author SHA1 Message Date
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
Anton Romanov a352f561fa Merge branch '118-bug-create-paper-notification' into 'dev'
Resolve "Bug: не отправляется сообщение о создании новой статьи"

Closes #118

See merge request romanov73/ng-tracker!79
5 years ago
Семенова Мария a8fbf98d85 #118 check if next deadline present 5 years ago
Nightblade73 51877023d1 #70 added new column to event 5 years ago
Anton Romanov 1fe2f5469b Merge branch '108-references-formatting' into 'dev'
Resolve "Форматирование списка литературы"

Closes #108

See merge request romanov73/ng-tracker!78
5 years ago
T-Midnight 51e121ae24 #117 add BAK papers filter 5 years ago
Семенова Мария 8f3e3fd9a7 #108 add formatting methods 5 years ago
Семенова Мария 71ec7bb726 #108 add reference dto 5 years ago
Nightblade73 34925b81ff #70 added schedule for deadline of conference 5 years ago
Nightblade73 16e9bf1fb5 #70 added update notification for all participants 5 years ago
Nightblade73 c489ebbf91 #70 added create notification for all users about new conference 5 years ago
Anton Romanov 88ec35faa0 Merge branch '68-ping-conf' into 'dev'
Resolve "Ping конференции в списке конференций"

Closes #68

See merge request romanov73/ng-tracker!69
5 years ago
Anton Romanov fc94ea1f26 Merge branch '116-delete-deadline' into 'dev'
Resolve "Удаление дедлайна"

Closes #116

See merge request romanov73/ng-tracker!75
5 years ago
T-Midnight 7853496048 #116 add style for delete icon 5 years ago
T-Midnight 2bb5189fff #116 update view 5 years ago
T-Midnight 4fa0c14ae6 #116 add removeDeadline method 5 years ago
T-Midnight 7c5a0826c5 #116 add new variable 5 years ago
T-Midnight 8ced83ad2b #116 delete annotation 5 years ago
Nightblade73 bc73265109 Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf
# Conflicts:
#	src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
#	src/main/java/ru/ulstu/conference/service/ConferenceService.java
#	src/main/resources/db/changelog-master.xml
5 years ago
Nightblade73 b77619777e #68 added dashboard-card styles depending on the conference.ping count 5 years ago
Nightblade73 70d260c34b #68 ping but style 5 years ago
Nightblade73 d4b514a9b0 #68 added ping in db 5 years ago