T-Midnight
|
410d0d9634
|
Create service&repository for Project
|
6 years ago |
|
T-Midnight
|
307b640e8e
|
Create js for grants
|
6 years ago |
|
T-Midnight
|
25278bcdd8
|
Create html fragments
|
6 years ago |
|
T-Midnight
|
a2fa574888
|
Create Controller&Service
|
6 years ago |
|
T-Midnight
|
c2a32d6c27
|
Update ProjectDto
|
6 years ago |
|
T-Midnight
|
9e5f3d7247
|
Add constructor
|
6 years ago |
|
T-Midnight
|
edd38beb67
|
Add function getNextDeadline()
|
6 years ago |
|
T-Midnight
|
eff5344aea
|
Create GrantRepository
|
6 years ago |
|
T-Midnight
|
42d33d1be8
|
Create setters for GrantDto
|
6 years ago |
Anton Romanov
|
469a3ad07d
|
fix display paper title
|
6 years ago |
|
Anton Romanov
|
6e14860c34
|
fix paper status template
|
6 years ago |
|
Anton Romanov
|
823f7a7743
|
try to fix template resolvers, step 4
|
6 years ago |
|
Anton Romanov
|
5a9ccbcfc1
|
try to fix template resolvers, step 3
|
6 years ago |
|
Anton Romanov
|
e8bad4e24e
|
try to fix template resolvers, step 2
|
6 years ago |
|
Anton Romanov
|
7089bd6c42
|
try to fix template resolvers
|
6 years ago |
|
Anton Romanov
|
9ec7b42972
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
486a0ac50a
|
try to fix gradlew
|
6 years ago |
|
Anton Romanov
|
fbaaac3a91
|
sort filtered papers
|
6 years ago |
|
Anton Romanov
|
7dc34e1a82
|
Merge branch '47-statuses' into 'master'
Resolve "Дополнительные статусы"
Closes #47
See merge request romanov73/ng-tracker!23
|
6 years ago |
|
Anton Romanov
|
fa1c4a9c1c
|
add statuses
|
6 years ago |
|
Anton Romanov
|
503f7f68bc
|
Merge branch '46-mvc' into 'master'
Resolve "Перевести на MVC контроллеры"
Closes #46
See merge request romanov73/ng-tracker!22
|
6 years ago |
|
Anton Romanov
|
468f440d9d
|
fix filer
|
6 years ago |
|
Anton Romanov
|
ec1e3ff052
|
fix scripts
|
6 years ago |
|
Anton Romanov
|
dc5abe1508
|
show authors
|
6 years ago |
|
Anton Romanov
|
c88ce3ac37
|
confirm delete paper
|
6 years ago |
|
Anton Romanov
|
c2c420027b
|
add papers navigation
|
6 years ago |
|
Anton Romanov
|
3e8b74f362
|
fix submit form
|
6 years ago |
|
Anton Romanov
|
d5121c895e
|
fix email notification
|
6 years ago |
|
Anton Romanov
|
05296bb26e
|
fix route
|
6 years ago |
|
Anton Romanov
|
59e2c9b544
|
edit deadlines
|
6 years ago |
|
Anton Romanov
|
54ea705890
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
6 years ago |
|
Anton Romanov
|
ac569ed9a9
|
Merge branch 'master' into 46-mvc
# Conflicts:
# src/main/java/ru/ulstu/paper/controller/PaperController.java
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/resources/public/js/papers.js
# src/main/resources/templates/papers/paper.html
# src/main/resources/templates/papers/papers.html
|
6 years ago |
|
Anton Romanov
|
932cb71e71
|
Merge branch '36-' into 'master'
Resolve "Создать модель грантов"
Closes #36
See merge request romanov73/ng-tracker!21
|
6 years ago |
|
Anton Romanov
|
d71a8d2c83
|
move classes, add deadline to entities, fix db changelogs
|
6 years ago |
|
T-Midnight
|
590cd16abe
|
Create model for grant, deadline and project
|
6 years ago |
|
Anton Romanov
|
35a08ab451
|
save authors
|
6 years ago |
|
Anton Romanov
|
1f264331fa
|
fix npe
|
6 years ago |
|
Anton Romanov
|
7b8f7a2047
|
format dates
|
6 years ago |
|
Anton Romanov
|
54bf5735e5
|
fix create paper
|
6 years ago |
|
Anton Romanov
|
67f440ac8a
|
add rest controller
|
6 years ago |
|
Anton Romanov
|
7794738f63
|
fix js
|
6 years ago |
|
Anton Romanov
|
3d4a7b09f3
|
show status
|
6 years ago |
|
Anton Romanov
|
dfe44ab842
|
add validation
|
6 years ago |
|
Anton Romanov
|
f9670ad0a5
|
pass values for paper
|
6 years ago |
|
Anton Romanov
|
f376fedc64
|
load paper
|
6 years ago |
|
Anton Romanov
|
aee396f686
|
Merge branch '14-filter-frontend' into 'master'
Resolve "Фильтр статей"
Closes #14
See merge request romanov73/ng-tracker!18
|
6 years ago |
|
Anton Romanov
|
13f9081aee
|
fix failed commit
|
6 years ago |
|
Anton Romanov
|
d2d2a7ae71
|
Merge branch '10-savePaper' into 'master'
Resolve "Сохранение статьи"
Closes #10
See merge request romanov73/ng-tracker!16
|
6 years ago |
|
Anton Romanov
|
5fa5d670a5
|
show paper list in mvc
|
6 years ago |
Alyona
|
f5068f8be9
|
filter
|
6 years ago |