Commit Graph

927 Commits (23797bae9eb1fcc4942776e485078324b1cb56c9)
 

Author SHA1 Message Date
Nightblade73 dc34c7bfb7 #104 fixed conference-row style 5 years ago
Nightblade73 5263393379 #104 remove chart example from dashboard 5 years ago
Nightblade73 80de18d3ee #104 create fixed, remove update 5 years ago
Nightblade73 bde9cb51fb #104 some methods fixed 5 years ago
Nightblade73 c0937d721a #104 removePaper, addPaper, takePart fixed 5 years ago
Nightblade73 ce7b4c9c7a #104 addDeadline, removeDeadline fixed 5 years ago
Anton Romanov 19a6b45cf9 Merge branch '79-students-tags-generation' into 'dev'
Resolve "Генерация периодических задач по тегам"

Closes #79

See merge request romanov73/ng-tracker!80
5 years ago
Artem.Arefev c47d4f8a05 #88 removed unused imports 5 years ago
Artem.Arefev 33f62c04e7 Merge branch '87-inviting-user' into 88-change-password 5 years ago
Artem.Arefev d50673f5fa 87-inviting-user small fix in mail template, and changed default user name 5 years ago
Artem.Arefev f8f501b8ff 88-change-password base 5 years ago
ASH cd1caa559e Merge branch 'dev' into 79-students-tags-generation
# Conflicts:
#	src/main/java/ru/ulstu/students/service/TaskService.java
5 years ago
ASH bc9cca62d6 #79 refactoring 5 years ago
Artem.Arefev ca3159a66b Merge branch '87-inviting-user' into 88-change-password 5 years ago
Artem.Arefev 3226cc3971 87 fixed UserControllerV2 logger 5 years ago
Artem.Arefev 48a18a3a57 87 fixed imports 5 years ago
Artem.Arefev d88f67ce00 87 transactional inviting 5 years ago
Artem.Arefev 11ef644e5e 88 inviting user base 5 years ago
Nightblade73 1e06edfcc0 Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf
# Conflicts:
#	src/main/java/ru/ulstu/conference/service/ConferenceService.java
5 years ago
Nightblade73 7952787229 #104 add new tests, fixes 5 years ago
Nightblade73 00c5d5f755 #104 test refactoring 5 years ago
Artem.Arefev 3d02f551cc Merge branch 'lk_v2' into 87-inviting-user 5 years ago
Artem.Arefev 95fc9da47d lk base, created from dev 5 years ago
Nightblade73 11cab955b4 #104 test create 5 years ago
Nightblade73 c88c77cd7d #104 test find one dto 5 years ago
Nightblade73 1c5c05b5e4 #104 test take part 5 years ago
Nightblade73 e6cb991463 #104 test is member 5 years ago
Nightblade73 a8d987b01f #104 test copy from dto method 5 years ago
Nightblade73 3a9fde3404 #104 setUp fields 5 years ago
Nightblade73 9da5fd8a7a #104 shock, the first unit test works 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
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