Anton Romanov
|
37e20fb472
|
Update README.md
|
5 years ago |
|
Anton Romanov
|
1dbb9b9136
|
Merge branch '33-paper-url' into 'dev'
Resolve "Добавить в конференцию/статью ссылку на сайт"
Closes #33
See merge request romanov73/ng-tracker!36
|
5 years ago |
Семенова Мария
|
b90e7c054b
|
#33 link in new tab
|
5 years ago |
|
Семенова Мария
|
c228f5aee0
|
Merge branch 'dev' into 33-paper-url
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
Anton Romanov
|
f5ce1aa269
|
Merge branch '13-paper-files' into 'dev'
Resolve "Загрузка и сохранение файлов статей"
Closes #13
See merge request romanov73/ng-tracker!35
|
5 years ago |
|
Anton Romanov
|
482e74e10e
|
#13 reduce of code
|
5 years ago |
|
Anton Romanov
|
7012c00c5f
|
#13 fix condition
|
5 years ago |
|
Семенова Мария
|
a0b65f341b
|
#13 streams refactoring
|
5 years ago |
|
Семенова Мария
|
5da9de1bab
|
#13 rename 'deleted', move creating fileDto to service
|
5 years ago |
|
Семенова Мария
|
c702e2abb4
|
#13 fileDataDto instead of Object[]
|
5 years ago |
|
Семенова Мария
|
3c068df201
|
#13 some refactoring
|
5 years ago |
|
Семенова Мария
|
1a522f7b44
|
Merge branch 'dev' into 13-paper-files
|
5 years ago |
|
Семенова Мария
|
e6bf603edc
|
#33 url in paper
|
5 years ago |
|
Anton Romanov
|
c374cb4232
|
merge deploy environments
|
5 years ago |
|
Anton Romanov
|
d35e0f7ba3
|
add environment
|
5 years ago |
|
Семенова Мария
|
1425cceb63
|
#13 download files
|
5 years ago |
|
Семенова Мария
|
8dc5eec35c
|
#13 add files to db
|
5 years ago |
|
Семенова Мария
|
4fb8061653
|
#13 addNewFile js function
|
5 years ago |
|
Семенова Мария
|
e609b27518
|
Merge branch 'dev' into 13-paper-files
# Conflicts:
# src/main/java/ru/ulstu/paper/model/PaperDto.java
|
5 years ago |
|
Семенова Мария
|
cb394edf90
|
#13 file list on paper page
|
5 years ago |
|
Anton Romanov
|
9418a47a1d
|
Merge branch '50-refactorForGrants' into 'dev'
Resolve "Тех. долг: отрефакторить контроллеры и модели"
Closes #50
See merge request romanov73/ng-tracker!32
|
5 years ago |
T-Midnight
|
29df7120bf
|
Delete DeadlineDTO and update usages
|
5 years ago |
|
Семенова Мария
|
0764d961fa
|
#13 add fileDataDto
|
5 years ago |
|
Семенова Мария
|
7b601c744f
|
#13 change model, schema
|
5 years ago |
|
T-Midnight
|
99d85a5648
|
Add new status for grant
|
5 years ago |
|
T-Midnight
|
c25c17d8ba
|
Rename title
|
5 years ago |
|
T-Midnight
|
de96be2471
|
Create Navigation class to avoid "magic strings" and code duplication
|
5 years ago |
|
Anton Romanov
|
ae58a5b6e4
|
Merge branch '72-link-to-timetable' into 'dev'
Resolve "Ссылка на расписание пользователя"
Closes #72
See merge request romanov73/ng-tracker!31
|
5 years ago |
|
Anton Romanov
|
90bb94d864
|
add patronymic
|
5 years ago |
|
Anton Romanov
|
48894b2176
|
display user in filter
|
5 years ago |
|
Anton Romanov
|
da7a17ee49
|
add service methods
|
5 years ago |
|
Anton Romanov
|
20ecb47867
|
add timetable link
|
5 years ago |
|
Anton Romanov
|
3169551968
|
Merge branch '54-view-conference' into 'dev'
Resolve "Вёрстка страницы просмотра информации о конференции"
Closes #54
See merge request romanov73/ng-tracker!26
|
5 years ago |
Nightblade73
|
5cb865eb70
|
#54 deleted edit btn
|
5 years ago |
|
Nightblade73
|
2fec35264c
|
#54 add back link, css fixes
|
5 years ago |
|
Nightblade73
|
f90d92b19d
|
#54 add custom paper-list
|
5 years ago |
|
Nightblade73
|
d332282e03
|
#54 add custom deadline-list, add edit-button, add edit and delete icons
|
5 years ago |
|
Nightblade73
|
7fff337c3a
|
#54 add member list
|
5 years ago |
|
Nightblade73
|
76ec5add30
|
#54 part of make-up
|
5 years ago |
|
Nightblade73
|
c21a65a075
|
#54 add transitions
|
5 years ago |
|
Anton Romanov
|
42fdb51337
|
fix login
|
5 years ago |
|
Nightblade73
|
93e68b1929
|
#50 creating html page, changing href
|
5 years ago |
|
Anton Romanov
|
febdb0b027
|
Merge branch '29-page-header' into 'dev'
Resolve "Адаптивный заголовок на странице"
Closes #29
See merge request romanov73/ng-tracker!28
|
5 years ago |
|
Anton Romanov
|
cb73340c3f
|
fix css
|
5 years ago |
|
Anton Romanov
|
4226be6406
|
fix props
|
5 years ago |
|
Anton Romanov
|
dd90bd24a9
|
fix props
|
5 years ago |
user
|
285b43c63c
|
header fix
|
5 years ago |
|
Anton Romanov
|
4f47b1beb6
|
fix code
|
5 years ago |
|
Anton Romanov
|
e2c12d9fb2
|
fix code
|
5 years ago |
|
Anton Romanov
|
3d8e8ca4f2
|
fix branch
|
5 years ago |