Commit Graph

208 Commits

Author SHA1 Message Date
Anton Romanov
486a0ac50a try to fix gradlew 2018-12-19 00:09:07 +04:00
Anton Romanov
7dc34e1a82 Merge branch '47-statuses' into 'master'
Resolve "Дополнительные статусы"

Closes #47

See merge request romanov73/ng-tracker!23
2018-12-18 18:45:43 +00:00
Anton Romanov
fa1c4a9c1c add statuses 2018-12-18 22:42:34 +04:00
Anton Romanov
503f7f68bc Merge branch '46-mvc' into 'master'
Resolve "Перевести на MVC контроллеры"

Closes #46

See merge request romanov73/ng-tracker!22
2018-12-18 18:18:25 +00:00
Anton Romanov
468f440d9d fix filer 2018-12-18 22:15:21 +04:00
Anton Romanov
ec1e3ff052 fix scripts 2018-12-18 19:40:23 +04:00
Anton Romanov
dc5abe1508 show authors 2018-12-18 19:23:15 +04:00
Anton Romanov
c88ce3ac37 confirm delete paper 2018-12-18 18:47:15 +04:00
Anton Romanov
c2c420027b add papers navigation 2018-12-18 18:05:30 +04:00
Anton Romanov
3e8b74f362 fix submit form 2018-12-17 17:56:48 +04:00
Anton Romanov
d5121c895e fix email notification 2018-12-17 17:29:06 +04:00
Anton Romanov
05296bb26e fix route 2018-12-17 17:28:52 +04:00
Anton Romanov
59e2c9b544 edit deadlines 2018-12-17 13:46:08 +04:00
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
2018-12-14 16:00:46 +04:00
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
2018-12-14 16:00:33 +04:00
Anton Romanov
932cb71e71 Merge branch '36-' into 'master'
Resolve "Создать модель грантов"

Closes #36

See merge request romanov73/ng-tracker!21
2018-12-11 11:14:21 +00:00
Anton Romanov
d71a8d2c83 move classes, add deadline to entities, fix db changelogs 2018-12-11 15:08:35 +04:00
T-Midnight
590cd16abe Create model for grant, deadline and project 2018-12-08 23:53:38 +04:00
Anton Romanov
35a08ab451 save authors 2018-12-05 18:08:47 +04:00
Anton Romanov
1f264331fa fix npe 2018-12-05 17:36:53 +04:00
Anton Romanov
7b8f7a2047 format dates 2018-12-05 17:06:56 +04:00
Anton Romanov
54bf5735e5 fix create paper 2018-12-05 16:51:26 +04:00
Anton Romanov
67f440ac8a add rest controller 2018-12-05 06:00:33 +00:00
Anton Romanov
7794738f63 fix js 2018-12-04 14:49:23 +04:00
Anton Romanov
3d4a7b09f3 show status 2018-12-04 14:48:39 +04:00
Anton Romanov
dfe44ab842 add validation 2018-12-04 14:13:01 +04:00
Anton Romanov
f9670ad0a5 pass values for paper 2018-12-04 11:35:51 +04:00
Anton Romanov
f376fedc64 load paper 2018-11-26 23:07:14 +04:00
Anton Romanov
aee396f686 Merge branch '14-filter-frontend' into 'master'
Resolve "Фильтр статей"

Closes #14

See merge request romanov73/ng-tracker!18
2018-11-23 16:40:15 +00:00
Anton Romanov
13f9081aee fix failed commit 2018-11-23 20:37:24 +04:00
Anton Romanov
d2d2a7ae71 Merge branch '10-savePaper' into 'master'
Resolve "Сохранение статьи"

Closes #10

See merge request romanov73/ng-tracker!16
2018-11-23 16:24:26 +00:00
Anton Romanov
5fa5d670a5 show paper list in mvc 2018-11-23 16:45:40 +04:00
Alyona
f5068f8be9 filter 2018-11-23 14:17:16 +04:00
Alyona
a9ea796bbb Merge branch 'master' into 14-filter-frontend 2018-11-23 14:12:37 +04:00
Alyona
df6bc223aa Merge remote-tracking branch 'origin/master' 2018-11-23 14:10:49 +04:00
Alyona
5eff1bac81 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. 2018-11-23 14:10:36 +04:00
Elena
8fc6d3b569 задача 10(new) 2018-11-23 14:05:23 +04:00
Elena
51e84e22a6 задача 10 2018-11-23 13:53:20 +04:00
Elena
fe6e52a19c Merge branch 'master' into 10-savePaper 2018-11-23 12:39:36 +04:00
Anton Romanov
e84e542309 fix colors 2018-11-22 21:48:36 +04:00
Anton Romanov
7f1fb168e1 fix colors 2018-11-22 21:31:41 +04:00
Anton Romanov
4163276da3 add paper status 2018-11-22 21:06:58 +04:00
Anton Romanov
1b2db5b5d4 Merge remote-tracking branch 'origin/master' 2018-11-22 11:20:08 +04:00
Anton Romanov
ccd07305ec add mertica 2018-11-22 11:19:50 +04:00
Anton Romanov
724dd6a78a remove empty page 2018-11-21 15:47:26 +04:00
Anton Romanov
161fab55de add toolbar 2018-11-21 15:47:14 +04:00
Anton Romanov
0aec0c3c8e Merge remote-tracking branch 'origin/master' 2018-11-21 15:42:20 +04:00
Anton Romanov
908bf814ce Merge branch '31-' into 'master'
Resolve "Создать страницу гранта"

Closes #31

See merge request romanov73/ng-tracker!20
2018-11-21 11:42:47 +00:00
Anton Romanov
29586c9313 close failed papers 2018-11-21 15:40:20 +04:00
T-Midnight
f6647d6752 Create grant page 2018-11-21 15:28:41 +04:00