Commit Graph

945 Commits (dev)
 

Author SHA1 Message Date
ASH 3698d31bc8 #76 fixing conflicts 5 years ago
Nightblade73 53cc777734 #64 delete conference refactor 5 years ago
Васин Антон 53cc947a17 #97 copy from DTO edited 5 years ago
Васин Антон ba565746f5 #97 dashboard added 5 years ago
Васин Антон 519dd51446 #97 dashboard added 5 years ago
Васин Антон 349e7373ff #97 save function 5 years ago
Nightblade73 2767403128 #64 added saving in db 5 years ago
Nightblade73 5bfeaff054 #64 added method addPaper 5 years ago
Anton Romanov b6ced3ce1a Merge branch '60-sort-conf' into 'dev'
Resolve "Сортировка списка конференций"

Closes #60

See merge request romanov73/ng-tracker!66
5 years ago
Anton Romanov 7fac92b52f Merge branch '110-paper-type' into 'dev'
Resolve "Тип статьи"

Closes #110

See merge request romanov73/ng-tracker!67
5 years ago
ASH 6876d09557 #76 adding style to filters 5 years ago
Nightblade73 ddd21dab1c #60 added dashboard 5 years ago
ASH 8400c5d40d Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter
# Conflicts:
#	src/main/resources/templates/students/dashboard.html
5 years ago
Nightblade73 a4ae42f072 #60 added sorting 5 years ago
Семенова Мария a3d1834ab8 #110 add paper type 5 years ago
Anton Romanov bc98785be9 Merge branch '59-filter-conference' into 'dev'
Resolve "Фильтрация списка конференции"

Closes #59

See merge request romanov73/ng-tracker!65
5 years ago
Nightblade73 a9f4a326c5 #59 fixed styles 5 years ago
Nightblade73 338d7c2e09 #59 added begin-end dates in conferenceRow 5 years ago
T-Midnight eec739a49f #41 create simple attach of articles 5 years ago
T-Midnight f29d31b840 #41 create changelog 5 years ago
Nightblade73 34033fac5f #59 added filtration 5 years ago
Nightblade73 e2b49689d5 #59 changed filterDto 5 years ago
Nightblade73 9f664b2618 #59 add front thymeleaf 5 years ago
Anton Romanov 21ba06170a Merge branch '106-papers-bug' into 'dev'
Resolve "Bug: не отображается список статей"

Closes #106

See merge request romanov73/ng-tracker!62
5 years ago
Anton Romanov 9e31bfa7d7 #106 add checkstyle rules 5 years ago
Anton Romanov 2d0f2aeecd Merge branch '69-take-part-conf' into 'dev'
Resolve "Принять участие в конференции пользователю"

Closes #69

See merge request romanov73/ng-tracker!56
5 years ago
Nightblade73 b623402aa8 #69 changed method getConference in controller 5 years ago
Nightblade73 9edcebb2f5 #69 changed isCurrentUserParticipant 5 years ago
Nightblade73 713e50043e Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf
# Conflicts:
#	src/main/resources/db/changelog-master.xml
5 years ago
Anton Romanov 9506057bb1 Merge branch '41-js' into 'dev'
Resolve "Переход к гранту со страницы панели управления"

Closes #41

See merge request romanov73/ng-tracker!63
5 years ago
T-Midnight f387b4eb52 #41 add link to the grant page 5 years ago
Семенова Мария 6c8554a0b8 #106 change boolean to nullable 5 years ago
ASH 7bec7b4e44 #76 filters added 5 years ago
Anton Romanov 5a55e3cfc8 Merge branch '42--2' into 'dev'
Resolve "Форма добавления и фильтра участников гранта"

Closes #42

See merge request romanov73/ng-tracker!44
5 years ago
T-Midnight 958a0d461b #42 merge with dev 5 years ago
T-Midnight 416ad7eeda #42 merge with dev 5 years ago
Anton Romanov 3bdb8798cd Merge branch '105-paper-latex-editing' into 'dev'
Resolve "Генерация PDF файла из формата latex"

Closes #105

See merge request romanov73/ng-tracker!60
5 years ago
ASH 59887e5141 #76 delete function added 5 years ago
ASH 9da227ab34 #76 fixing dashboard 5 years ago
Семенова Мария 6c6a748978 #105 danger message type 5 years ago
Семенова Мария a2dca6b7c6 Merge branch 'dev' into paper-latex-editing
# Conflicts:
#	src/main/java/ru/ulstu/paper/model/Paper.java
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
#	src/main/java/ru/ulstu/paper/service/PaperService.java
#	src/main/resources/db/changelog-master.xml
#	src/main/resources/templates/papers/paper.html
5 years ago
Васин Антон f1f7c1f0f6 #97 cancel button edited 5 years ago
Nightblade73 96431701df #69 added button disabling take part, if cur user already taken part 5 years ago
Васин Антон 6469ddcd42 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev 5 years ago
Nightblade73 8fd352aaa4 #69 added styles 5 years ago
Anton Romanov 8474fb492f Merge branch '96-edit-project-page' into 'dev'
Resolve "Страница редактирования проекта"

Closes #96

See merge request romanov73/ng-tracker!57
5 years ago
Васин Антон d015b02862 #96 removed wildcards from imports 5 years ago
Васин Антон ced3b0a978 #96 database edited 5 years ago
T-Midnight e284298200 #42 rename variables 5 years ago
Васин Антон b722687050 #96 edit project page 5 years ago