Commit Graph

620 Commits

Author SHA1 Message Date
Nightblade73
a9f4a326c5 #59 fixed styles 2019-04-19 18:38:56 +04:00
Nightblade73
338d7c2e09 #59 added begin-end dates in conferenceRow 2019-04-19 18:32:24 +04:00
T-Midnight
eec739a49f #41 create simple attach of articles 2019-04-19 17:49:36 +04:00
T-Midnight
f29d31b840 #41 create changelog 2019-04-19 17:45:22 +04:00
Nightblade73
34033fac5f #59 added filtration 2019-04-19 17:36:46 +04:00
Nightblade73
e2b49689d5 #59 changed filterDto 2019-04-19 17:31:30 +04:00
Nightblade73
9f664b2618 #59 add front thymeleaf 2019-04-19 17:30:30 +04:00
Anton Romanov
21ba06170a Merge branch '106-papers-bug' into 'dev'
Resolve "Bug: не отображается список статей"

Closes #106

See merge request romanov73/ng-tracker!62
2019-04-19 13:13:10 +00:00
Anton Romanov
9e31bfa7d7 #106 add checkstyle rules 2019-04-19 17:08:12 +04:00
Anton Romanov
2d0f2aeecd Merge branch '69-take-part-conf' into 'dev'
Resolve "Принять участие в конференции пользователю"

Closes #69

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

Closes #41

See merge request romanov73/ng-tracker!63
2019-04-19 09:52:24 +00:00
T-Midnight
f387b4eb52 #41 add link to the grant page 2019-04-19 11:36:27 +04:00
Семенова Мария
6c8554a0b8 #106 change boolean to nullable 2019-04-18 23:37:08 +04:00
ASH
7bec7b4e44 #76 filters added 2019-04-18 23:15:32 +04:00
Anton Romanov
5a55e3cfc8 Merge branch '42--2' into 'dev'
Resolve "Форма добавления и фильтра участников гранта"

Closes #42

See merge request romanov73/ng-tracker!44
2019-04-18 18:40:37 +00:00
T-Midnight
958a0d461b #42 merge with dev 2019-04-18 22:35:07 +04:00
T-Midnight
416ad7eeda #42 merge with dev 2019-04-18 22:34:20 +04:00
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
ASH
59887e5141 #76 delete function added 2019-04-18 21:57:56 +04:00
ASH
9da227ab34 #76 fixing dashboard 2019-04-18 21:38:55 +04: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
Васин Антон
f1f7c1f0f6 #97 cancel button edited 2019-04-18 16:49:10 +03:00
Nightblade73
96431701df #69 added button disabling take part, if cur user already taken part 2019-04-18 15:38:45 +04:00
Nightblade73
8fd352aaa4 #69 added styles 2019-04-18 14:33:49 +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
T-Midnight
e284298200 #42 rename variables 2019-04-18 13:09:50 +04:00
Васин Антон
b722687050 #96 edit project page 2019-04-18 10:32:43 +03:00
Nightblade73
918079ac89 #69 fixed not working code, now user can take part in conference and choose participation and deposit 2019-04-18 11:20:44 +04: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
Nightblade73
7e4d8d4918 #69 added method take part in conference 2019-04-17 14:51:19 +04:00
Васин Антон
ca3e87a8c5 #96 edit project blank page 2019-04-17 13:50:22 +03:00
T-Midnight
506fa01fab Revert: #42 merge with dev 2019-04-17 13:42:22 +04:00
T-Midnight
97d7d00098 #42 merge with dev 2019-04-17 13:30:14 +04:00