Commit Graph

689 Commits (43e7b9fe1f22882e15c92b57efa7a25f94a9b47f)
 

Author SHA1 Message Date
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
Nightblade73 d921def09d #68 added ping method 5 years ago
Nightblade73 f556b969b4 #68 added demo version of charts, using highcharts lib 5 years ago
Nightblade73 b16b3ed2e3 #68 added class structure 5 years ago
Nightblade73 5bff419dbd #68 added ping table 5 years ago
Anton Romanov 4dd0a6c210 fix merge bug 5 years ago
Anton Romanov bb2518e5f4 Merge branch '76-students-tags-filter' into 'dev'
Resolve "Фильтр задач по типу (тегам)"

Closes #77, #75, and #76

See merge request romanov73/ng-tracker!61
5 years ago
Anton Romanov 1e6fbdc1fa Merge branch '64-add-article-conf' into 'dev'
Resolve "Добавить новую статью к конференции"

Closes #64

See merge request romanov73/ng-tracker!70
5 years ago
Anton Romanov 54c6fe815d Merge branch '113-delete-project' into 'dev'
Resolve "Реализовать удаление проекта"

Closes #113

See merge request romanov73/ng-tracker!71
5 years ago
Nightblade73 d37c9bda57 #64 excluded adding articles with the same name 5 years ago
Nightblade73 fe55890518 #64 more style fixes 5 years ago
Nightblade73 7eb5dce94e #64 style fixes 5 years ago
ASH 7248a84c30 #76 adding sorting 5 years ago
Васин Антон 02d643727e #113 projects/projects edited 5 years ago
Васин Антон 50a0f8aa78 #113 projects.js added 5 years ago
Васин Антон 2418e953be #113 line fragment edited 5 years ago
Васин Антон e32da7c7c2 #113 delete function 5 years ago
Anton Romanov 3aea19088d Merge branch '115-follow-up-from-resolve' into 'dev'
Resolve "Follow-up from "Resolve "Прикрепление статей к гранту"""

Closes #115

See merge request romanov73/ng-tracker!73
5 years ago
Anton Romanov 8f2f6adc3b #64 show global message 5 years ago
T-Midnight c18ecea13b #115 move method to service 5 years ago
T-Midnight bf515a3fcb Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve 5 years ago
Anton Romanov 39f44403c1 Merge branch '114-bug-projects-list' into 'dev'
Resolve "Bug: не отображается список проектов"

Closes #114

See merge request romanov73/ng-tracker!72
5 years ago
Васин Антон 2f3c1addbb #114 unused imports removed 5 years ago
Васин Антон c78ea05255 #114 update edited 5 years ago
T-Midnight 26969dba5b #107 merge with dev 5 years ago
T-Midnight 6df1a87367 #107 merge with dev 5 years ago
T-Midnight 546b0dc323 #107 add styles 5 years ago
Васин Антон 41bd00d645 project dashboard edited 5 years ago
Nightblade73 6d6ea3136d #64 dont show error message 5 years ago