Семенова Мария
|
1425cceb63
|
#13 download files
|
2019-03-18 21:02:26 +04:00 |
|
Семенова Мария
|
8dc5eec35c
|
#13 add files to db
|
2019-03-18 19:17:28 +04:00 |
|
Семенова Мария
|
4fb8061653
|
#13 addNewFile js function
|
2019-03-18 18:39:15 +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 |
|
Семенова Мария
|
cb394edf90
|
#13 file list on paper page
|
2019-03-18 16:02:55 +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 |
|
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
|
90bb94d864
|
add patronymic
|
2019-03-12 14:44:11 +04:00 |
|
Anton Romanov
|
48894b2176
|
display user in filter
|
2019-03-12 13:40:48 +04:00 |
|
Anton Romanov
|
da7a17ee49
|
add service methods
|
2019-03-12 12:51:59 +03:00 |
|
Anton Romanov
|
3169551968
|
Merge branch '54-view-conference' into 'dev'
Resolve "Вёрстка страницы просмотра информации о конференции"
Closes #54
See merge request romanov73/ng-tracker!26
|
2019-03-11 10:49:07 +00:00 |
|
Nightblade73
|
c21a65a075
|
#54 add transitions
|
2019-03-06 16:48:51 +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
|
c00390a17b
|
filter dashboard papers
|
2019-01-17 01:01:26 +04:00 |
|
Anton Romanov
|
779bc3eafc
|
fix failed conditions
|
2019-01-17 00:57:34 +04: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
|
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 |
|