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
|
edc9c7c090
|
sort deadlines
|
2018-12-30 19:22:51 +04: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
|
d7721ce19d
|
Update classes
|
2018-12-24 15:20:57 +04:00 |
|
T-Midnight
|
410d0d9634
|
Create service&repository for Project
|
2018-12-24 13:05:37 +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
|
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
|
fbaaac3a91
|
sort filtered papers
|
2018-12-18 23:02:48 +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
|
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
|
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
|
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
|
5fa5d670a5
|
show paper list in mvc
|
2018-11-23 16:45:40 +04:00 |
|
Elena
|
8fc6d3b569
|
задача 10(new)
|
2018-11-23 14:05:23 +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
|
4e3e882f76
|
Merge branch '30-main-grants-page' into 'master'
Resolve "Создать страницу грантов"
Closes #30
See merge request romanov73/ng-tracker!17
|
2018-11-21 08:51:11 +00:00 |
|
Anton Romanov
|
ef32bba684
|
Merge remote-tracking branch 'origin/master'
|
2018-11-21 12:46:42 +04:00 |
|
Anton Romanov
|
6314ca6ec5
|
notify if paper deadline in future
|
2018-11-21 12:46:27 +04:00 |
|
Anton Romanov
|
58299d749d
|
fix for remove event
|
2018-11-19 08:21:22 +04:00 |
|
Anton Romanov
|
2dc0b4e27c
|
fix event create conditions
|
2018-11-19 07:46:02 +04:00 |
|
Anton Romanov
|
2d78753b06
|
show events
|
2018-11-17 11:56:52 +04:00 |
|
Anton Romanov
|
f587f80eb6
|
fix code
|
2018-11-14 17:03:22 +04:00 |
|
Anton Romanov
|
112958a70b
|
fix code
|
2018-11-14 15:18:22 +04:00 |
|