Nightblade73
|
58a8495835
|
Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf
# Conflicts:
# src/main/java/ru/ulstu/timeline/service/EventService.java
|
5 years ago |
|
Nightblade73
|
ab59cb524e
|
#103 fix code style
|
5 years ago |
|
Nightblade73
|
1f8722e3ff
|
#103 code refactoring
|
5 years ago |
|
Nightblade73
|
6044d6f8e3
|
#111 save method refactor
|
5 years ago |
Anton Romanov
|
a3afdeb988
|
Merge branch '123-student-task-timeline' into 'dev'
Resolve "Добавление таймлайна для дедлайнов задач"
Closes #123
See merge request romanov73/ng-tracker!91
|
5 years ago |
|
Anton Romanov
|
aaa21d591d
|
Merge branch '121-reduce-paper-title' into 'dev'
Resolve "Сокращение названий статей в прикреплении"
Closes #121
See merge request romanov73/ng-tracker!89
|
5 years ago |
T-Midnight
|
f6830d499b
|
#121 update view
|
5 years ago |
|
T-Midnight
|
99ec7af319
|
#121 reduce paper title
|
5 years ago |
|
T-Midnight
|
e1907d3169
|
#121 change Paper to PaperDto in attaching papers
|
5 years ago |
|
Nightblade73
|
451e7e5d04
|
#103 fix code style
|
5 years ago |
|
Nightblade73
|
5cbbb6c319
|
#103 fix code style
|
5 years ago |
|
Nightblade73
|
70062992ae
|
#103 clear code
|
5 years ago |
|
Nightblade73
|
fe53c86136
|
#103 fixed delete conf test
|
5 years ago |
ASH
|
5b4180e685
|
#123 fixing layout
|
5 years ago |
|
ASH
|
a11e10dec4
|
#123 adding task timeline
|
5 years ago |
|
Nightblade73
|
d846192046
|
#111 fixes
|
5 years ago |
|
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 |
|
Nightblade73
|
b2e8a43cee
|
#103 delete conf test
|
5 years ago |
|
Nightblade73
|
3f32a61ed2
|
Merge remote-tracking branch 'origin/103-autotest-conf' into 103-autotest-conf
# Conflicts:
# src/test/java/IndexConferenceTest.java
|
5 years ago |
|
Nightblade73
|
6edcf8f594
|
#103 add sort and filter test, fixed delete conference, if it has fk with event
|
5 years ago |
|
Nightblade73
|
4686406954
|
#103 add undock article
|
5 years ago |
|
Nightblade73
|
4e4e7ae194
|
#103 add paper transition
|
5 years ago |
|
Nightblade73
|
cad8682088
|
#103 add adding article
|
5 years ago |
|
Nightblade73
|
d9a4224317
|
#103 add attach article
|
5 years ago |
|
Nightblade73
|
7b4318a3b5
|
#103 add delete deadline
|
5 years ago |
|
Nightblade73
|
0cb7b05c25
|
#103 add check take part
|
5 years ago |
|
Nightblade73
|
253f4b4aad
|
#103 add check new deadline
|
5 years ago |
|
Nightblade73
|
1ad66d6fb1
|
#103 change name method test
|
5 years ago |
|
Nightblade73
|
961fdf9397
|
#70 added conference class, added create method test
|
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 |
|
Nightblade73
|
b57142e28f
|
#70 added unique name control
|
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 |
Васин Антон
|
279cc0e18a
|
#101 project model edited
|
5 years ago |
|
Васин Антон
|
b1e101c940
|
#101 db event edited
|
5 years ago |
|
T-Midnight
|
2dae39a100
|
#119 create grants notification service
|
5 years ago |