Commit Graph

40 Commits

Author SHA1 Message Date
Семенова Мария
c21e8afc1f latex text in paper 2019-03-23 22:04:56 +04:00
Anton Romanov
482e74e10e #13 reduce of code 2019-03-22 13:58:03 +04:00
Семенова Мария
c702e2abb4 #13 fileDataDto instead of Object[] 2019-03-21 18:26:28 +04:00
Семенова Мария
e609b27518 Merge branch 'dev' into 13-paper-files
# Conflicts:
#	src/main/java/ru/ulstu/paper/model/PaperDto.java
2019-03-18 16:13:22 +04:00
T-Midnight
29df7120bf Delete DeadlineDTO and update usages 2019-03-18 14:27:54 +04:00
Семенова Мария
0764d961fa #13 add fileDataDto 2019-03-18 13:00:34 +04:00
Семенова Мария
7b601c744f #13 change model, schema 2019-03-18 11:07:30 +04:00
Anton Romanov
779bc3eafc fix failed conditions 2019-01-17 00:57:34 +04:00
Anton Romanov
edc9c7c090 sort deadlines 2018-12-30 19:22:51 +04:00
Anton Romanov
469a3ad07d fix display paper title 2018-12-21 00:07:26 +04:00
Anton Romanov
fa1c4a9c1c add statuses 2018-12-18 22:42:34 +04:00
Anton Romanov
468f440d9d fix filer 2018-12-18 22:15:21 +04:00
Anton Romanov
dc5abe1508 show authors 2018-12-18 19:23:15 +04:00
Anton Romanov
3e8b74f362 fix submit form 2018-12-17 17:56:48 +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
Anton Romanov
35a08ab451 save authors 2018-12-05 18:08:47 +04:00
Anton Romanov
54bf5735e5 fix create paper 2018-12-05 16:51:26 +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
4163276da3 add paper status 2018-11-22 21:06:58 +04:00
Anton Romanov
29586c9313 close failed papers 2018-11-21 15:40:20 +04:00
Anton Romanov
06864c7ec8 read dashboard 2018-11-14 15:15:23 +04:00
Anton Romanov
2a76acc7ad filter papers 2018-11-13 15:41:18 +04:00
Anton Romanov
67881262be add notification templates 2018-11-09 10:04:50 +04:00
Anton Romanov
bd78be93ab add paper create strategy 2018-11-08 19:36:50 +04:00
Alyona
43740981f2 add deadlineDate to models 2018-10-27 22:24:10 +04:00
Anton Romanov
e163529d66 load paper statuses 2018-10-11 10:03:44 +04:00
Anton Romanov
e9d81fef48 sort papers 2018-09-05 14:50:49 +04:00
Anton Romanov
2fda487555 add paper authors 2018-05-05 14:49:34 +04:00
Anton Romanov
e465651eb2 add paper status 2018-05-05 11:17:13 +04:00
Anton Romanov
b140a61a9b fix papers crud 2018-05-05 10:57:02 +04:00
Anton Romanov
7d286c0d76 fix paper controller 2018-05-05 00:39:18 +04:00
Anton Romanov
d8fa601103 add file uploading 2018-05-05 00:24:48 +04:00
Anton Romanov
896d23948f add paper controller 2018-05-04 18:04:09 +04:00