Anton Romanov
|
3bdb8798cd
|
Merge branch '105-paper-latex-editing' into 'dev'
Resolve "Генерация PDF файла из формата latex"
Closes #105
See merge request romanov73/ng-tracker!60
|
2019-04-18 18:31:18 +00:00 |
|
Семенова Мария
|
6c6a748978
|
#105 danger message type
|
2019-04-18 19:03:04 +04:00 |
|
Семенова Мария
|
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
|
2019-04-18 18:20:51 +04:00 |
|
Anton Romanov
|
8474fb492f
|
Merge branch '96-edit-project-page' into 'dev'
Resolve "Страница редактирования проекта"
Closes #96
See merge request romanov73/ng-tracker!57
|
2019-04-18 09:32:48 +00:00 |
|
Васин Антон
|
d015b02862
|
#96 removed wildcards from imports
|
2019-04-18 13:26:11 +03:00 |
|
Васин Антон
|
ced3b0a978
|
#96 database edited
|
2019-04-18 12:10:27 +03:00 |
|
Васин Антон
|
b722687050
|
#96 edit project page
|
2019-04-18 10:32:43 +03:00 |
|
Семенова Мария
|
789fda9c98
|
remove nonstopmode from bibtex
|
2019-04-18 10:49:36 +04:00 |
|
Anton Romanov
|
4eef57bce7
|
Merge branch '102-autotesting' into 'dev'
Resolve "Классы для автотестов"
Closes #102
See merge request romanov73/ng-tracker!58
|
2019-04-17 14:17:41 +00:00 |
|
Anton Romanov
|
32c7261c2e
|
#102 restore old swagger
|
2019-04-17 18:13:21 +04:00 |
|
Anton Romanov
|
4615183ae4
|
#102 temporary skip tests until fix docker container
|
2019-04-17 17:46:06 +04:00 |
|
Anton Romanov
|
49a379ab3c
|
#102 temporary skip tests until fix docker container
|
2019-04-17 17:37:43 +04:00 |
|
Anton Romanov
|
5b89ed7284
|
#102 fix code style
|
2019-04-17 17:26:54 +04:00 |
|
Anton Romanov
|
cfbe36197b
|
#102 add auto tests
|
2019-04-17 17:20:20 +04:00 |
|
Васин Антон
|
e85c814f70
|
#96 project comment added
|
2019-04-17 14:46:42 +03:00 |
|
Васин Антон
|
255692d6ea
|
#96 project status added
|
2019-04-17 14:38:07 +03:00 |
|
Васин Антон
|
f079e34a57
|
#96 project title added
|
2019-04-17 14:18:35 +03:00 |
|
Васин Антон
|
4ea40931eb
|
#96 project status fragment added
|
2019-04-17 14:06:38 +03:00 |
|
Васин Антон
|
a89d93a9b0
|
#96 project line fragment added
|
2019-04-17 14:01:45 +03:00 |
|
Васин Антон
|
ca3e87a8c5
|
#96 edit project blank page
|
2019-04-17 13:50:22 +03:00 |
|
Anton Romanov
|
487aa578a7
|
Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"
Closes #86
See merge request romanov73/ng-tracker!53
|
2019-04-17 07:35:00 +00:00 |
|
Васин Антон
|
f5c1bb940c
|
#86 projects main page
|
2019-04-17 11:24:30 +03:00 |
|
Anton Romanov
|
b05a32edac
|
fix issue template
|
2019-04-17 09:33:58 +04:00 |
|
Anton Romanov
|
7491d7e9e4
|
Merge branch '65-undock-article' into 'dev'
Resolve "Удалить статью"
Closes #65
See merge request romanov73/ng-tracker!55
|
2019-04-16 11:13:20 +00:00 |
|
Nightblade73
|
81d07645c2
|
#65 added delete method of article, fixed copyFromDto method
|
2019-04-16 14:18:49 +04:00 |
|
Anton Romanov
|
3facc0c26e
|
Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"
Closes #78 and #74
See merge request romanov73/ng-tracker!47
|
2019-04-16 09:36:58 +00:00 |
|
Anton Romanov
|
d81d1cf72c
|
#74 some code fixes
|
2019-04-16 13:41:10 +04:00 |
|
Anton Romanov
|
0c719d8886
|
Merge branch '66-attach-exist-article' into 'dev'
Resolve "Прикрепление статьи"
Closes #66
See merge request romanov73/ng-tracker!54
|
2019-04-16 09:33:57 +00:00 |
|
Nightblade73
|
d4b38d314f
|
#66 fixed bug, when attach-article lose what needed to attach after add or remove deadline
|
2019-04-16 13:22:15 +04:00 |
|
anastasia shulga
|
95f70f425a
|
Update2 TagService.java
|
2019-04-16 08:21:36 +00:00 |
|
anastasia shulga
|
dbd61ce80c
|
Update TagService.java
|
2019-04-16 07:55:37 +00:00 |
|
Nightblade73
|
dca644eba1
|
#66 added handling of adding articles not added to the picker.
|
2019-04-16 10:42:40 +04:00 |
|
Nightblade73
|
fbf9a7943b
|
#66 changed from Set to List
|
2019-04-16 09:51:31 +04:00 |
|
Nightblade73
|
735cbb5f7b
|
#66 added front-end part
|
2019-04-16 09:46:24 +04:00 |
|
Anton Romanov
|
06b5d66d3e
|
Merge branch '58-delete-conf' into 'dev'
Resolve "Удаление конференции"
Closes #58
See merge request romanov73/ng-tracker!51
|
2019-04-15 17:32:22 +00:00 |
|
Nightblade73
|
909c657c89
|
#58 added delete confirm
|
2019-04-15 15:48:17 +04:00 |
|
Nightblade73
|
0cc8de2d32
|
#58 added delete method of conference
|
2019-04-15 10:36:55 +04:00 |
|
Anton Romanov
|
9e657a7d2d
|
Merge branch '62-delete-deadline' into 'dev'
Resolve "Удаление дедлайна"
Closes #62
See merge request romanov73/ng-tracker!50
|
2019-04-14 19:33:45 +00:00 |
|
Nightblade73
|
f88f035e65
|
#55 little fix
|
2019-04-14 21:34:39 +04:00 |
|
ASH
|
1f36e04cd3
|
#74 fully adding tags
|
2019-04-14 21:24:22 +04:00 |
|
Nightblade73
|
8cfc64ea85
|
#55 added delete input style
|
2019-04-14 20:42:11 +04:00 |
|
ASH
|
d6a11a5902
|
#74 fixing codestyle and tags
|
2019-04-14 17:50:23 +04:00 |
|
Anton Romanov
|
34499abd60
|
#62 fix remove deadline in other JPA operation
|
2019-04-13 22:59:59 +04:00 |
|
Nightblade73
|
9711febefb
|
#55 added delete deadline
|
2019-04-13 13:02:36 +04:00 |
|
Nightblade73
|
b4a2a8086d
|
#62 remove verification of empty deadline list
|
2019-04-12 15:51:06 +04:00 |
|
ASH
|
5eae7305c4
|
#74 codestyle
|
2019-04-11 00:14:03 +04:00 |
|
ASH
|
f019806a8e
|
#74 fixing adding and db everything added except tags
|
2019-04-10 23:57:55 +04:00 |
|
ASH
|
9b697c6f3f
|
#74 adding models, controllers and services
|
2019-04-09 23:18:39 +04:00 |
|
Anton Romanov
|
d1813f656e
|
Merge branch '61-adding-deadline' into 'dev'
Resolve "Добавление дедлайна для конференции"
Closes #61
See merge request romanov73/ng-tracker!49
|
2019-04-09 12:34:06 +00:00 |
|
Nightblade73
|
c308a5e5af
|
#55 Navigation's method "hasErrors" don't work. it returns String, not redirection.
|
2019-04-09 14:47:14 +04:00 |
|