Resolve "Генерация периодических задач по тегам" #207

Merged
ashette merged 32 commits from 79-students-tags-generation into dev 5 years ago

32 Commits (dev)

Author SHA1 Message Date
ASH cd1caa559e Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
#	src/main/java/ru/ulstu/students/service/TaskService.java
5 years ago
Anton Romanov 51851baa48 Merge branch '103-autotest-conf' into 'dev'
Resolve "Реализовать интеграционные автотесты для проверки модулей"

See merge request romanov73/ng-tracker!90
5 years ago
Anton Romanov 10a9bd7a28 Merge branch '111-unique-name-control-conf' into 'dev'
Resolve "Контроль уникальности названия"

See merge request romanov73/ng-tracker!86
5 years ago
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
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
Nightblade73 b57142e28f #70 added unique name control 5 years ago