Anton Romanov
|
54c6fe815d
|
Merge branch '113-delete-project' into 'dev'
Resolve "Реализовать удаление проекта"
Closes #113
See merge request romanov73/ng-tracker!71
|
2019-04-24 09:34:12 +00:00 |
|
Nightblade73
|
d37c9bda57
|
#64 excluded adding articles with the same name
|
2019-04-24 10:17:32 +04:00 |
|
Nightblade73
|
7eb5dce94e
|
#64 style fixes
|
2019-04-24 09:42:00 +04:00 |
|
ASH
|
7248a84c30
|
#76 adding sorting
|
2019-04-24 01:03:56 +04:00 |
|
Васин Антон
|
02d643727e
|
#113 projects/projects edited
|
2019-04-23 23:32:40 +03:00 |
|
Васин Антон
|
e32da7c7c2
|
#113 delete function
|
2019-04-23 23:11:45 +03:00 |
|
Anton Romanov
|
8f2f6adc3b
|
#64 show global message
|
2019-04-23 23:15:22 +04:00 |
|
T-Midnight
|
c18ecea13b
|
#115 move method to service
|
2019-04-23 22:03:06 +04:00 |
|
T-Midnight
|
bf515a3fcb
|
Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve
|
2019-04-23 21:47:54 +04:00 |
|
Васин Антон
|
2f3c1addbb
|
#114 unused imports removed
|
2019-04-23 14:20:17 +03:00 |
|
Васин Антон
|
c78ea05255
|
#114 update edited
|
2019-04-23 14:11:42 +03:00 |
|
T-Midnight
|
26969dba5b
|
#107 merge with dev
|
2019-04-23 15:02:41 +04:00 |
|
T-Midnight
|
6df1a87367
|
#107 merge with dev
|
2019-04-23 15:01:47 +04:00 |
|
Васин Антон
|
41bd00d645
|
project dashboard edited
|
2019-04-23 13:40:11 +03:00 |
|
Nightblade73
|
6d6ea3136d
|
#64 dont show error message
|
2019-04-23 13:37:56 +04:00 |
|
T-Midnight
|
d3b8be2cf1
|
#107 add view of the selected papers
|
2019-04-23 13:21:13 +04:00 |
|
Васин Антон
|
019fe7c652
|
#97 adding deadlines
|
2019-04-23 10:32:23 +03:00 |
|
ASH
|
3698d31bc8
|
#76 fixing conflicts
|
2019-04-22 21:52:26 +04:00 |
|
Nightblade73
|
53cc777734
|
#64 delete conference refactor
|
2019-04-22 21:46:42 +04:00 |
|
Васин Антон
|
53cc947a17
|
#97 copy from DTO edited
|
2019-04-22 15:48:29 +03:00 |
|
Васин Антон
|
ba565746f5
|
#97 dashboard added
|
2019-04-22 14:41:58 +03:00 |
|
Васин Антон
|
349e7373ff
|
#97 save function
|
2019-04-22 14:19:01 +03:00 |
|
Nightblade73
|
2767403128
|
#64 added saving in db
|
2019-04-22 15:11:52 +04:00 |
|
Nightblade73
|
5bfeaff054
|
#64 added method addPaper
|
2019-04-22 11:13:04 +04:00 |
|
Anton Romanov
|
b6ced3ce1a
|
Merge branch '60-sort-conf' into 'dev'
Resolve "Сортировка списка конференций"
Closes #60
See merge request romanov73/ng-tracker!66
|
2019-04-22 03:12:00 +00:00 |
|
ASH
|
6876d09557
|
#76 adding style to filters
|
2019-04-21 19:02:27 +04:00 |
|
Nightblade73
|
ddd21dab1c
|
#60 added dashboard
|
2019-04-21 17:18:44 +04:00 |
|
ASH
|
8400c5d40d
|
Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter
# Conflicts:
# src/main/resources/templates/students/dashboard.html
|
2019-04-21 15:47:56 +04:00 |
|
Nightblade73
|
a4ae42f072
|
#60 added sorting
|
2019-04-21 15:03:31 +04:00 |
|
Семенова Мария
|
a3d1834ab8
|
#110 add paper type
|
2019-04-21 12:17:31 +04:00 |
|
Nightblade73
|
a9f4a326c5
|
#59 fixed styles
|
2019-04-19 18:38:56 +04:00 |
|
Nightblade73
|
338d7c2e09
|
#59 added begin-end dates in conferenceRow
|
2019-04-19 18:32:24 +04:00 |
|
T-Midnight
|
eec739a49f
|
#41 create simple attach of articles
|
2019-04-19 17:49:36 +04:00 |
|
Nightblade73
|
34033fac5f
|
#59 added filtration
|
2019-04-19 17:36:46 +04:00 |
|
Nightblade73
|
e2b49689d5
|
#59 changed filterDto
|
2019-04-19 17:31:30 +04:00 |
|
Anton Romanov
|
21ba06170a
|
Merge branch '106-papers-bug' into 'dev'
Resolve "Bug: не отображается список статей"
Closes #106
See merge request romanov73/ng-tracker!62
|
2019-04-19 13:13:10 +00:00 |
|
Anton Romanov
|
9e31bfa7d7
|
#106 add checkstyle rules
|
2019-04-19 17:08:12 +04:00 |
|
Nightblade73
|
b623402aa8
|
#69 changed method getConference in controller
|
2019-04-19 14:39:07 +04:00 |
|
Nightblade73
|
9edcebb2f5
|
#69 changed isCurrentUserParticipant
|
2019-04-19 14:29:08 +04:00 |
|
Nightblade73
|
713e50043e
|
Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2019-04-19 14:24:32 +04:00 |
|
Семенова Мария
|
6c8554a0b8
|
#106 change boolean to nullable
|
2019-04-18 23:37:08 +04:00 |
|
ASH
|
7bec7b4e44
|
#76 filters added
|
2019-04-18 23:15:32 +04:00 |
|
Anton Romanov
|
5a55e3cfc8
|
Merge branch '42--2' into 'dev'
Resolve "Форма добавления и фильтра участников гранта"
Closes #42
See merge request romanov73/ng-tracker!44
|
2019-04-18 18:40:37 +00:00 |
|
T-Midnight
|
416ad7eeda
|
#42 merge with dev
|
2019-04-18 22:34:20 +04:00 |
|
ASH
|
59887e5141
|
#76 delete function added
|
2019-04-18 21:57:56 +04:00 |
|
Семенова Мария
|
6c6a748978
|
#105 danger message type
|
2019-04-18 19:03:04 +04:00 |
|
Семенова Мария
|
a2dca6b7c6
|
Merge branch 'dev' into paper-latex-editing
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
# src/main/resources/templates/papers/paper.html
|
2019-04-18 18:20:51 +04:00 |
|
Nightblade73
|
96431701df
|
#69 added button disabling take part, if cur user already taken part
|
2019-04-18 15:38:45 +04:00 |
|
Anton Romanov
|
8474fb492f
|
Merge branch '96-edit-project-page' into 'dev'
Resolve "Страница редактирования проекта"
Closes #96
See merge request romanov73/ng-tracker!57
|
2019-04-18 09:32:48 +00:00 |
|
Васин Антон
|
d015b02862
|
#96 removed wildcards from imports
|
2019-04-18 13:26:11 +03:00 |
|
T-Midnight
|
e284298200
|
#42 rename variables
|
2019-04-18 13:09:50 +04:00 |
|
Васин Антон
|
b722687050
|
#96 edit project page
|
2019-04-18 10:32:43 +03:00 |
|
Nightblade73
|
918079ac89
|
#69 fixed not working code, now user can take part in conference and choose participation and deposit
|
2019-04-18 11:20:44 +04:00 |
|
Семенова Мария
|
789fda9c98
|
remove nonstopmode from bibtex
|
2019-04-18 10:49:36 +04:00 |
|
Anton Romanov
|
cfbe36197b
|
#102 add auto tests
|
2019-04-17 17:20:20 +04:00 |
|
Васин Антон
|
e85c814f70
|
#96 project comment added
|
2019-04-17 14:46:42 +03:00 |
|
Васин Антон
|
255692d6ea
|
#96 project status added
|
2019-04-17 14:38:07 +03:00 |
|
Nightblade73
|
7e4d8d4918
|
#69 added method take part in conference
|
2019-04-17 14:51:19 +04:00 |
|
Васин Антон
|
ca3e87a8c5
|
#96 edit project blank page
|
2019-04-17 13:50:22 +03:00 |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
2019-04-17 13:30:14 +04:00 |
|
T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
2019-04-17 13:25:10 +04:00 |
|
Nightblade73
|
8564f2cf34
|
#69 managed to create a connection through a new entity
|
2019-04-17 13:00:48 +04:00 |
|
Anton Romanov
|
487aa578a7
|
Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"
Closes #86
See merge request romanov73/ng-tracker!53
|
2019-04-17 07:35:00 +00:00 |
|
Васин Антон
|
f5c1bb940c
|
#86 projects main page
|
2019-04-17 11:24:30 +03:00 |
|
Nightblade73
|
81d07645c2
|
#65 added delete method of article, fixed copyFromDto method
|
2019-04-16 14:18:49 +04:00 |
|
Anton Romanov
|
3facc0c26e
|
Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"
Closes #78 and #74
See merge request romanov73/ng-tracker!47
|
2019-04-16 09:36:58 +00:00 |
|
Anton Romanov
|
d81d1cf72c
|
#74 some code fixes
|
2019-04-16 13:41:10 +04:00 |
|
Nightblade73
|
d4b38d314f
|
#66 fixed bug, when attach-article lose what needed to attach after add or remove deadline
|
2019-04-16 13:22:15 +04:00 |
|
anastasia shulga
|
95f70f425a
|
Update2 TagService.java
|
2019-04-16 08:21:36 +00:00 |
|
anastasia shulga
|
dbd61ce80c
|
Update TagService.java
|
2019-04-16 07:55:37 +00:00 |
|
Nightblade73
|
dca644eba1
|
#66 added handling of adding articles not added to the picker.
|
2019-04-16 10:42:40 +04:00 |
|
Nightblade73
|
fbf9a7943b
|
#66 changed from Set to List
|
2019-04-16 09:51:31 +04:00 |
|
Nightblade73
|
909c657c89
|
#58 added delete confirm
|
2019-04-15 15:48:17 +04:00 |
|
Nightblade73
|
0cc8de2d32
|
#58 added delete method of conference
|
2019-04-15 10:36:55 +04:00 |
|
Nightblade73
|
f88f035e65
|
#55 little fix
|
2019-04-14 21:34:39 +04:00 |
|
Nightblade73
|
8cfc64ea85
|
#55 added delete input style
|
2019-04-14 20:42:11 +04:00 |
|
ASH
|
d6a11a5902
|
#74 fixing codestyle and tags
|
2019-04-14 17:50:23 +04:00 |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
2019-04-13 23:56:24 +04:00 |
|
Anton Romanov
|
34499abd60
|
#62 fix remove deadline in other JPA operation
|
2019-04-13 22:59:59 +04:00 |
|
Nightblade73
|
9711febefb
|
#55 added delete deadline
|
2019-04-13 13:02:36 +04:00 |
|
T-Midnight
|
1756f29505
|
#42 filter authors by leader and degree
|
2019-04-13 12:39:53 +04:00 |
|
Nightblade73
|
b4a2a8086d
|
#62 remove verification of empty deadline list
|
2019-04-12 15:51:06 +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
|
f7d766f02d
|
#42 rename birth_date column
|
2019-04-11 21:37:24 +04:00 |
|
ASH
|
5eae7305c4
|
#74 codestyle
|
2019-04-11 00:14:03 +04:00 |
|
ASH
|
f019806a8e
|
#74 fixing adding and db everything added except tags
|
2019-04-10 23:57:55 +04:00 |
|
T-Midnight
|
e8461e26eb
|
#42 fix birthDate and degree to User
|
2019-04-10 10:09:41 +04:00 |
|
T-Midnight
|
51c755ac07
|
#42 method hasErrors didn't work, return to the previous state
|
2019-04-10 09:39:07 +04:00 |
|
ASH
|
9b697c6f3f
|
#74 adding models, controllers and services
|
2019-04-09 23:18:39 +04:00 |
|
T-Midnight
|
e2e10477ac
|
#42 delete GrantStatusDto
|
2019-04-09 21:31:23 +04:00 |
|
Nightblade73
|
c308a5e5af
|
#55 Navigation's method "hasErrors" don't work. it returns String, not redirection.
|
2019-04-09 14:47:14 +04:00 |
|
Nightblade73
|
689a7799e3
|
#55 added method in controller
|
2019-04-08 22:04:30 +04:00 |
|
Anton Romanov
|
7dca991c2f
|
Merge branch '55-new-conf' into 'dev'
Resolve "Добавление новой конференции"
Closes #55
See merge request romanov73/ng-tracker!43
|
2019-04-08 03:33:40 +00:00 |
|
Anton Romanov
|
e350f8b3c1
|
#55 refactor controller navigation, fix conference edit url
|
2019-04-08 07:40:26 +04:00 |
|
Nightblade73
|
c49b56916c
|
#55 added initialization of fields in ConferenceDto
|
2019-04-07 10:08:13 +04:00 |
|
Nightblade73
|
db43da9ec0
|
#55 added nav controller
|
2019-04-07 10:01:44 +04:00 |
|
Nightblade73
|
3e5aeaf290
|
#55 fast fixes
|
2019-04-06 14:41:10 +04:00 |
|
Nightblade73
|
926cd02096
|
#55 fixed adding to DB
|
2019-04-06 11:05:30 +04:00 |
|
T-Midnight
|
7465803162
|
#42 add columns 'birth_date'&'degree' to User
|
2019-04-05 22:06:16 +04:00 |
|
Anton Romanov
|
e0ca29fbab
|
#83 fix wrong entity
|
2019-04-05 21:47:42 +04:00 |
|
Nightblade73
|
eb524d49d0
|
#55 added html side, don't work, because can't parse date, like in deadlines
|
2019-04-05 18:01:43 +04:00 |
|
Anton Romanov
|
72add3638b
|
#83 check CI
|
2019-04-05 18:01:12 +04:00 |
|
Anton Romanov
|
c7cdbe9044
|
#83 add tasks, modify build script for passing application properties
|
2019-04-05 17:35:17 +04:00 |
|
Nightblade73
|
67bfad22f9
|
#55 added create and update methods
|
2019-04-05 16:30:45 +04:00 |
|
Anton Romanov
|
54edeb0559
|
#82 fix user abbreviate
|
2019-04-05 13:39:53 +04:00 |
|
Anton Romanov
|
91d2168012
|
#82 show paper formatted lines
|
2019-04-05 13:34:38 +04:00 |
|
Nightblade73
|
d6b7fe790a
|
#55 added transition to the page new conference
|
2019-04-05 13:21:15 +04:00 |
|
Nightblade73
|
9d69f75530
|
#55 fixes
|
2019-04-04 20:26:38 +04:00 |
|
Nightblade73
|
2d04b1b43a
|
#55 added findAll method in ConferenceService
|
2019-04-04 17:58:22 +04:00 |
|
Nightblade73
|
d189891e8c
|
#55 added ConferenceFilterDto
|
2019-04-04 17:47:18 +04:00 |
|
Nightblade73
|
e3bbade40b
|
#55 added ConferenceDto
|
2019-04-04 17:39:28 +04:00 |
|
Nightblade73
|
dc12a671d2
|
#55 added setters/getters
|
2019-04-04 12:50:12 +04:00 |
|
Nightblade73
|
be2dd291f6
|
#55 added conference model without user's participation and deposit. May be needed new user model.
|
2019-04-04 12:48:05 +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 |
|
Семенова Мария
|
ded0ab482a
|
add nonstopmode
|
2019-04-03 17:46:45 +04:00 |
|
Anton Romanov
|
4104aa04cd
|
fixes for wrong build. entities always extends BaseEntity, tables must contains version column
|
2019-04-03 10:39:55 +04:00 |
|
Nightblade73
|
0428bad048
|
#57 created classes
|
2019-04-02 10:53:09 +04:00 |
|
Anton Romanov
|
c2dc080d23
|
Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"
Closes #71
See merge request romanov73/ng-tracker!29
|
2019-04-01 05:17:39 +00:00 |
|
Семенова Мария
|
030e1a3afb
|
Merge branch 'dev' into 18-paper-timeline
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/resources/db/changelog-master.xml
|
2019-03-28 18:32:44 +04:00 |
|
Anton Romanov
|
ba64b7df16
|
Merge branch 'restore-commits-page' into 'dev'
partially restored commits page
See merge request romanov73/ng-tracker!38
|
2019-03-28 11:58:02 +00:00 |
|
Anton Romanov
|
539095c89e
|
partially restored commits page
|
2019-03-28 14:59:35 +04:00 |
|
Семенова Мария
|
0c34571354
|
remove JLR library using
|
2019-03-28 14:51:17 +04:00 |
|
Anton Romanov
|
7b0b7a041a
|
#80 hide mvc controllers from api
|
2019-03-28 14:45:39 +04:00 |
|
Семенова Мария
|
2f0c461524
|
#18 add paper events
|
2019-03-28 12:40:10 +04:00 |
|
Семенова Мария
|
cf9a7f895f
|
pdf generating
|
2019-03-25 13:17:34 +04:00 |
|
Семенова Мария
|
10fe7e8a4e
|
paper files list fragment, latex attachs upload
|
2019-03-24 12:42:21 +04:00 |
|
Семенова Мария
|
c21e8afc1f
|
latex text in paper
|
2019-03-23 22:04:56 +04:00 |
|
Семенова Мария
|
c228f5aee0
|
Merge branch 'dev' into 33-paper-url
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
|
2019-03-23 12:04:51 +04:00 |
|
Anton Romanov
|
482e74e10e
|
#13 reduce of code
|
2019-03-22 13:58:03 +04:00 |
|
Anton Romanov
|
7012c00c5f
|
#13 fix condition
|
2019-03-22 13:52:06 +04:00 |
|
Семенова Мария
|
a0b65f341b
|
#13 streams refactoring
|
2019-03-22 13:21:32 +04:00 |
|
Семенова Мария
|
5da9de1bab
|
#13 rename 'deleted', move creating fileDto to service
|
2019-03-22 09:32:21 +04:00 |
|
Семенова Мария
|
c702e2abb4
|
#13 fileDataDto instead of Object[]
|
2019-03-21 18:26:28 +04:00 |
|
Семенова Мария
|
3c068df201
|
#13 some refactoring
|
2019-03-19 17:59:19 +04:00 |
|
Семенова Мария
|
e6bf603edc
|
#33 url in paper
|
2019-03-18 23:31:33 +04:00 |
|
Семенова Мария
|
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 |
|
ASH
|
bd975c53f3
|
#71 adding pages and layout
|
2019-03-11 22:46:51 +04: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 |
|
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 |
|