Commit Graph

493 Commits (a53a12fa557b3b85787edcb9cf1079dd41870f7d)
 

Author SHA1 Message Date
Семенова Мария 3c068df201 #13 some refactoring 5 years ago
Семенова Мария 1a522f7b44 Merge branch 'dev' into 13-paper-files 5 years ago
Nightblade73 5dc54dda8b #53 added supporting russian language, added linkable row in table 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
Nightblade73 fd22aecd22 #53 added supporting bootstrap style 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
Nightblade73 6296b661a9 #53 added conference js file 5 years ago
Nightblade73 a236fc50bc #53 added datatables lib support 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
ASH bd975c53f3 #71 adding pages and layout 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 13131186bf Merge branch 'dev' into 'master'
Dev

See merge request romanov73/ng-tracker!27
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
Anton Romanov 0fccbdc973 add links to papers 5 years ago
Anton Romanov 39c25c7b20 add links to papers 5 years ago
Anton Romanov a997f5fffa Update README.md 5 years ago
Anton Romanov f7bbf4d746 Merge branch 'dev' into 'master'
Dev to master

See merge request romanov73/ng-tracker!25
6 years ago