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 |
|
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 |
|
Nightblade73
|
918079ac89
|
#69 fixed not working code, now user can take part in conference and choose participation and deposit
|
5 years ago |
|
Семенова Мария
|
789fda9c98
|
remove nonstopmode from bibtex
|
5 years ago |
|
Anton Romanov
|
4eef57bce7
|
Merge branch '102-autotesting' into 'dev'
Resolve "Классы для автотестов"
Closes #102
See merge request romanov73/ng-tracker!58
|
5 years ago |
|
Anton Romanov
|
32c7261c2e
|
#102 restore old swagger
|
5 years ago |
|
Anton Romanov
|
4615183ae4
|
#102 temporary skip tests until fix docker container
|
5 years ago |
|
Anton Romanov
|
49a379ab3c
|
#102 temporary skip tests until fix docker container
|
5 years ago |
|
Anton Romanov
|
5b89ed7284
|
#102 fix code style
|
5 years ago |
|
Anton Romanov
|
cfbe36197b
|
#102 add auto tests
|
5 years ago |
|
Васин Антон
|
e85c814f70
|
#96 project comment added
|
5 years ago |
|
Васин Антон
|
255692d6ea
|
#96 project status added
|
5 years ago |
|
Васин Антон
|
f079e34a57
|
#96 project title added
|
5 years ago |
|
Васин Антон
|
4ea40931eb
|
#96 project status fragment added
|
5 years ago |
|
Васин Антон
|
a89d93a9b0
|
#96 project line fragment added
|
5 years ago |
|
Nightblade73
|
7e4d8d4918
|
#69 added method take part in conference
|
5 years ago |
|
Васин Антон
|
ca3e87a8c5
|
#96 edit project blank page
|
5 years ago |
|
T-Midnight
|
506fa01fab
|
Revert: #42 merge with dev
|
5 years ago |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
5 years ago |
|
T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
5 years ago |
|
Nightblade73
|
8564f2cf34
|
#69 managed to create a connection through a new entity
|
5 years ago |
|
Anton Romanov
|
487aa578a7
|
Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"
Closes #86
See merge request romanov73/ng-tracker!53
|
5 years ago |