romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity
490 Commits 15 Branches 1 Tag 45 MiB
4d2d7fa113
Commit Graph

490 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Romanov
4d2d7fa113 fix lambda 2019-04-26 09:47:41 +04:00
Anton Romanov
9393fbe326 fix deprecated imports 2019-04-26 09:46:38 +04:00
Anton Romanov
955bdaa438 fix repository method 2019-04-23 13:55:59 +04:00
Anton Romanov
60dfad5d76 Merge branch 'dev' into move-to-jdk11 
# Conflicts:
#	src/main/resources/db/changelog-master.xml
 2019-04-23 13:51:21 +04:00
Anton Romanov
e16b1da761 fix script 2019-04-23 12:46:17 +04:00
Anton Romanov
09cae66ca4 fix image 2019-04-23 12:38:15 +04:00
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
 2019-04-23 11:35:41 +04:00
Anton Romanov
5e86952cb6 Merge branch '97-edit-project' into 'dev' 
Resolve "Редактирование проекта"

Closes #97

See merge request romanov73/ng-tracker!59
 2019-04-23 07:34:13 +00:00
Васин Антон
019fe7c652 #97 adding deadlines 2019-04-23 10:32:23 +03:00
Васин Антон
53cc947a17 #97 copy from DTO edited 2019-04-22 15:48:29 +03:00
Васин Антон
ba565746f5 #97 dashboard added 2019-04-22 14:41:58 +03:00
Васин Антон
519dd51446 #97 dashboard added 2019-04-22 14:31:46 +03:00
Васин Антон
349e7373ff #97 save function 2019-04-22 14:19:01 +03:00
Anton Romanov
b6ced3ce1a Merge branch '60-sort-conf' into 'dev' 
Resolve "Сортировка списка конференций"

Closes #60

See merge request romanov73/ng-tracker!66
 2019-04-22 03:12:00 +00:00
Anton Romanov
7fac92b52f Merge branch '110-paper-type' into 'dev' 
Resolve "Тип статьи"

Closes #110

See merge request romanov73/ng-tracker!67
 2019-04-22 03:10:48 +00:00
Nightblade73
ddd21dab1c #60 added dashboard 2019-04-21 17:18:44 +04:00
Nightblade73
a4ae42f072 #60 added sorting 2019-04-21 15:03:31 +04:00
Семенова Мария
a3d1834ab8 #110 add paper type 2019-04-21 12:17:31 +04:00
Anton Romanov
bc98785be9 Merge branch '59-filter-conference' into 'dev' 
Resolve "Фильтрация списка конференции"

Closes #59

See merge request romanov73/ng-tracker!65
 2019-04-19 14:46:23 +00:00
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
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
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
Семенова Мария
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