Commit Graph

236 Commits

Author SHA1 Message Date
Семенова Мария
3c068df201 #13 some refactoring 2019-03-19 17:59:19 +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
c25c17d8ba Rename title 2019-03-15 12:19:25 +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
20ecb47867 add timetable link 2019-03-12 12:35:09 +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
5cb865eb70 #54 deleted edit btn 2019-03-11 14:43:32 +04:00
Nightblade73
2fec35264c #54 add back link, css fixes 2019-03-11 12:58:40 +04:00
Nightblade73
f90d92b19d #54 add custom paper-list 2019-03-11 11:36:00 +04:00
Nightblade73
d332282e03 #54 add custom deadline-list, add edit-button, add edit and delete icons 2019-03-10 22:15:09 +04:00
Nightblade73
7fff337c3a #54 add member list 2019-03-07 22:50:37 +04:00
Nightblade73
76ec5add30 #54 part of make-up 2019-03-06 20:51:46 +04:00
Nightblade73
c21a65a075 #54 add transitions 2019-03-06 16:48:51 +04:00
Anton Romanov
42fdb51337 fix login 2019-03-06 16:40:33 +04:00
Nightblade73
93e68b1929 #50 creating html page, changing href 2019-03-06 16:27:25 +04:00
Anton Romanov
cb73340c3f fix css 2019-03-06 16:19:43 +04:00
Anton Romanov
4226be6406 fix props 2019-03-06 14:36:46 +03:00
Anton Romanov
dd90bd24a9 fix props 2019-03-06 14:35:09 +03:00
user
285b43c63c header fix 2019-03-06 14:25:02 +03: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
0fccbdc973 add links to papers 2019-03-01 11:22:25 +04:00
Anton Romanov
39c25c7b20 add links to papers 2019-03-01 11:21:25 +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
cec13bb677 some layout fix 2018-12-30 19:23:11 +04:00
Anton Romanov
edc9c7c090 sort deadlines 2018-12-30 19:22:51 +04:00
Anton Romanov
2cac98be50 fix enum field name 2018-12-29 09:58:37 +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
816d115cc8 Hide button "Add Project" when project already exists (not perfect) 2018-12-25 02:44:50 +04:00
T-Midnight
18ad291e82 Made button "delete grant" visible 2018-12-25 00:14:38 +04:00
T-Midnight
fcbd91760d Rename table grant to grants 2018-12-24 23:39:19 +04:00
T-Midnight
d7721ce19d Update classes 2018-12-24 15:20:57 +04:00
T-Midnight
2f68339ba2 Add thymeleaf template 2018-12-24 15:18:52 +04:00
T-Midnight
410d0d9634 Create service&repository for Project 2018-12-24 13:05:37 +04:00