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 |
Васин Антон
|
f5c1bb940c
|
#86 projects main page
|
5 years ago |
Nightblade73
|
14c28050c7
|
#65 changed interface
|
5 years ago |
Anton Romanov
|
b05a32edac
|
fix issue template
|
5 years ago |
Anton Romanov
|
7491d7e9e4
|
Merge branch '65-undock-article' into 'dev'
Resolve "Удалить статью"
Closes #65
See merge request romanov73/ng-tracker!55
|
5 years ago |
Nightblade73
|
81d07645c2
|
#65 added delete method of article, fixed copyFromDto method
|
5 years ago |
Anton Romanov
|
3facc0c26e
|
Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"
Closes #78 and #74
See merge request romanov73/ng-tracker!47
|
5 years ago |
Anton Romanov
|
d81d1cf72c
|
#74 some code fixes
|
5 years ago |
Anton Romanov
|
0c719d8886
|
Merge branch '66-attach-exist-article' into 'dev'
Resolve "Прикрепление статьи"
Closes #66
See merge request romanov73/ng-tracker!54
|
5 years ago |
Nightblade73
|
d4b38d314f
|
#66 fixed bug, when attach-article lose what needed to attach after add or remove deadline
|
5 years ago |
anastasia shulga
|
95f70f425a
|
Update2 TagService.java
|
5 years ago |
anastasia shulga
|
dbd61ce80c
|
Update TagService.java
|
5 years ago |
Nightblade73
|
dca644eba1
|
#66 added handling of adding articles not added to the picker.
|
5 years ago |
Nightblade73
|
fbf9a7943b
|
#66 changed from Set to List
|
5 years ago |
Nightblade73
|
735cbb5f7b
|
#66 added front-end part
|
5 years ago |
Anton Romanov
|
06b5d66d3e
|
Merge branch '58-delete-conf' into 'dev'
Resolve "Удаление конференции"
Closes #58
See merge request romanov73/ng-tracker!51
|
5 years ago |
Nightblade73
|
909c657c89
|
#58 added delete confirm
|
5 years ago |
Nightblade73
|
0cc8de2d32
|
#58 added delete method of conference
|
5 years ago |
Anton Romanov
|
9e657a7d2d
|
Merge branch '62-delete-deadline' into 'dev'
Resolve "Удаление дедлайна"
Closes #62
See merge request romanov73/ng-tracker!50
|
5 years ago |
Nightblade73
|
f88f035e65
|
#55 little fix
|
5 years ago |