Anton Romanov
|
486a0ac50a
|
try to fix gradlew
|
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 |
|
Alyona
|
a9ea796bbb
|
Merge branch 'master' into 14-filter-frontend
|
6 years ago |
|
Alyona
|
df6bc223aa
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Alyona
|
5eff1bac81
|
Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.
|
6 years ago |
Elena
|
8fc6d3b569
|
задача 10(new)
|
6 years ago |
|
Elena
|
51e84e22a6
|
задача 10
|
6 years ago |
|
Elena
|
fe6e52a19c
|
Merge branch 'master' into 10-savePaper
|
6 years ago |
|
Anton Romanov
|
e84e542309
|
fix colors
|
6 years ago |
|
Anton Romanov
|
7f1fb168e1
|
fix colors
|
6 years ago |
|
Anton Romanov
|
4163276da3
|
add paper status
|
6 years ago |
|
Anton Romanov
|
1b2db5b5d4
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
ccd07305ec
|
add mertica
|
6 years ago |
|
Anton Romanov
|
724dd6a78a
|
remove empty page
|
6 years ago |
|
Anton Romanov
|
161fab55de
|
add toolbar
|
6 years ago |
|
Anton Romanov
|
0aec0c3c8e
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
908bf814ce
|
Merge branch '31-' into 'master'
Resolve "Создать страницу гранта"
Closes #31
See merge request romanov73/ng-tracker!20
|
6 years ago |
|
Anton Romanov
|
29586c9313
|
close failed papers
|
6 years ago |
|
T-Midnight
|
f6647d6752
|
Create grant page
|
6 years ago |