T-Midnight
|
bf515a3fcb
|
Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve
|
5 years ago |
Васин Антон
|
2d6de6b535
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
5 years ago |
Anton Romanov
|
39f44403c1
|
Merge branch '114-bug-projects-list' into 'dev'
Resolve "Bug: не отображается список проектов"
Closes #114
See merge request romanov73/ng-tracker!72
|
5 years ago |
Васин Антон
|
2f3c1addbb
|
#114 unused imports removed
|
5 years ago |
Васин Антон
|
c78ea05255
|
#114 update edited
|
5 years ago |
T-Midnight
|
26969dba5b
|
#107 merge with dev
|
5 years ago |
T-Midnight
|
6df1a87367
|
#107 merge with dev
|
5 years ago |
T-Midnight
|
546b0dc323
|
#107 add styles
|
5 years ago |
Васин Антон
|
41bd00d645
|
project dashboard edited
|
5 years ago |
Anton Romanov
|
955bdaa438
|
fix repository method
|
5 years ago |
Anton Romanov
|
60dfad5d76
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
5 years ago |
Nightblade73
|
6d6ea3136d
|
#64 dont show error message
|
5 years ago |
Васин Антон
|
70920cc612
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
5 years ago |
T-Midnight
|
d3b8be2cf1
|
#107 add view of the selected papers
|
5 years ago |
Anton Romanov
|
e16b1da761
|
fix script
|
5 years ago |
Anton Romanov
|
09cae66ca4
|
fix image
|
5 years ago |
Anton Romanov
|
7684bac74d
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# build.gradle
# src/main/java/ru/ulstu/grant/model/GrantDto.java
# src/main/java/ru/ulstu/grant/service/GrantService.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/project/model/Project.java
|
5 years ago |
Anton Romanov
|
5e86952cb6
|
Merge branch '97-edit-project' into 'dev'
Resolve "Редактирование проекта"
Closes #97
See merge request romanov73/ng-tracker!59
|
5 years ago |
Васин Антон
|
019fe7c652
|
#97 adding deadlines
|
5 years ago |
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 |