Commit Graph

243 Commits

Author SHA1 Message Date
AlexGames73
bd7e12220b Fix gradle 2019-01-10 21:46:54 +04:00
AlexGames73
383bbc343f Add ReactJS to project 2019-01-10 17:50:23 +04:00
Anton Romanov
c17591bf10 Update README.md 2019-01-08 19:55:27 +00:00
Anton Romanov
a18400a97c Update README.md 2019-01-08 19:36:36 +00:00
Anton Romanov
ffb3c65118 fix notifications 2019-01-05 08:01:07 +04:00
Anton Romanov
eab71c1210 fix notifications 2019-01-04 17:41:48 +04:00
Anton Romanov
cec13bb677 some layout fix 2018-12-30 19:23:11 +04:00
Anton Romanov
edc9c7c090 sort deadlines 2018-12-30 19:22:51 +04:00
Anton Romanov
2cac98be50 fix enum field name 2018-12-29 09:58:37 +04:00
Anton Romanov
7a490ef7a5 Merge branch '35-' into 'master'
Resolve "Создать контроллер грантов"

Closes #35

See merge request romanov73/ng-tracker!24
2018-12-28 10:04:42 +00:00
Anton Romanov
ebb036ee71 some refactor 2018-12-28 14:00:09 +04:00
Anton Romanov
ce78f8ad66 some refactor 2018-12-28 13:57:20 +04:00
T-Midnight
bcc64cda96 Create model folder for grant 2018-12-25 12:50:14 +04:00
T-Midnight
816d115cc8 Hide button "Add Project" when project already exists (not perfect) 2018-12-25 02:44:50 +04:00
T-Midnight
18ad291e82 Made button "delete grant" visible 2018-12-25 00:14:38 +04:00
T-Midnight
fcbd91760d Rename table grant to grants 2018-12-24 23:39:19 +04:00
T-Midnight
d7721ce19d Update classes 2018-12-24 15:20:57 +04:00
T-Midnight
2f68339ba2 Add thymeleaf template 2018-12-24 15:18:52 +04:00
T-Midnight
410d0d9634 Create service&repository for Project 2018-12-24 13:05:37 +04:00
T-Midnight
307b640e8e Create js for grants 2018-12-24 11:07:02 +04:00
T-Midnight
25278bcdd8 Create html fragments 2018-12-24 11:03:03 +04:00
T-Midnight
a2fa574888 Create Controller&Service 2018-12-23 02:22:41 +04:00
T-Midnight
c2a32d6c27 Update ProjectDto 2018-12-23 02:22:31 +04:00
T-Midnight
9e5f3d7247 Add constructor 2018-12-23 02:22:24 +04:00
T-Midnight
edd38beb67 Add function getNextDeadline() 2018-12-23 02:22:06 +04:00
T-Midnight
eff5344aea Create GrantRepository 2018-12-22 18:03:18 +04:00
T-Midnight
42d33d1be8 Create setters for GrantDto 2018-12-22 03:31:43 +04:00
Anton Romanov
469a3ad07d fix display paper title 2018-12-21 00:07:26 +04:00
Anton Romanov
6e14860c34 fix paper status template 2018-12-20 23:30:25 +04:00
Anton Romanov
823f7a7743 try to fix template resolvers, step 4 2018-12-19 01:29:54 +04:00
Anton Romanov
5a9ccbcfc1 try to fix template resolvers, step 3 2018-12-19 01:00:08 +04:00
Anton Romanov
e8bad4e24e try to fix template resolvers, step 2 2018-12-19 00:44:12 +04:00
Anton Romanov
7089bd6c42 try to fix template resolvers 2018-12-19 00:22:36 +04:00
Anton Romanov
9ec7b42972 Merge remote-tracking branch 'origin/master' 2018-12-19 00:11:39 +04:00
Anton Romanov
486a0ac50a try to fix gradlew 2018-12-19 00:09:07 +04:00
Anton Romanov
fbaaac3a91 sort filtered papers 2018-12-18 23:02:48 +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