Anton Romanov
|
7684bac74d
|
Merge branch 'dev' into move-to-jdk11
# Conflicts:
# build.gradle
# src/main/java/ru/ulstu/grant/model/GrantDto.java
# src/main/java/ru/ulstu/grant/service/GrantService.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/project/model/Project.java
|
2019-04-23 11:35:41 +04:00 |
|
T-Midnight
|
e284298200
|
#42 rename variables
|
2019-04-18 13:09:50 +04:00 |
|
T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
2019-04-17 13:25:10 +04:00 |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
2019-04-13 23:56:24 +04:00 |
|
T-Midnight
|
1756f29505
|
#42 filter authors by leader and degree
|
2019-04-13 12:39:53 +04:00 |
|
Anton Romanov
|
4955e9a637
|
#4--2 merge with dev
|
2019-04-11 22:39:59 +04:00 |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
2019-04-11 22:37:32 +04:00 |
|
T-Midnight
|
bd3513118c
|
#42 this don't work
|
2019-04-11 21:42:28 +04:00 |
|
T-Midnight
|
51c755ac07
|
#42 method hasErrors didn't work, return to the previous state
|
2019-04-10 09:39:07 +04:00 |
|
T-Midnight
|
e2e10477ac
|
#42 delete GrantStatusDto
|
2019-04-09 21:31:23 +04:00 |
|
Anton Romanov
|
e350f8b3c1
|
#55 refactor controller navigation, fix conference edit url
|
2019-04-08 07:40:26 +04:00 |
|
Anton Romanov
|
2cf3e52596
|
#73 merge dev into jdk11
|
2019-04-05 14:11:13 +04:00 |
|
T-Midnight
|
566b7821d1
|
#42 merge dev into 42
|
2019-04-04 09:43:26 +04:00 |
|
T-Midnight
|
8a7117d713
|
#42 Add leader and authors
|
2019-04-04 09:38:18 +04:00 |
|
Anton Romanov
|
7b0b7a041a
|
#80 hide mvc controllers from api
|
2019-03-28 14:45:39 +04:00 |
|
Anton Romanov
|
1487affb8e
|
#73 fix deprecated annotations and classes
|
2019-03-20 19:20:28 +04:00 |
|
Anton Romanov
|
e74261184f
|
#73 first fixes by update versions
|
2019-03-20 14:37:57 +04:00 |
|
T-Midnight
|
29df7120bf
|
Delete DeadlineDTO and update usages
|
2019-03-18 14:27:54 +04:00 |
|
T-Midnight
|
99d85a5648
|
Add new status for grant
|
2019-03-15 12:24:02 +04:00 |
|
T-Midnight
|
de96be2471
|
Create Navigation class to avoid "magic strings" and code duplication
|
2019-03-15 12:19:01 +04:00 |
|
Anton Romanov
|
4f47b1beb6
|
fix code
|
2019-03-04 10:28:46 +04:00 |
|
Anton Romanov
|
e2c12d9fb2
|
fix code
|
2019-03-04 10:24:30 +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
|
a2fa574888
|
Create Controller&Service
|
2018-12-23 02:22:41 +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
|
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 |
|