Commit Graph

285 Commits

Author SHA1 Message Date
Семенова Мария
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
Nightblade73
6296b661a9 #53 added conference js file 2019-03-16 14:44:34 +04:00
Nightblade73
a236fc50bc #53 added datatables lib support 2019-03-16 14:39:56 +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
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
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
T-Midnight
307b640e8e Create js for grants 2018-12-24 11:07:02 +04:00
T-Midnight
25278bcdd8 Create html fragments 2018-12-24 11:03:03 +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
6e14860c34 fix paper status template 2018-12-20 23:30:25 +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
ec1e3ff052 fix scripts 2018-12-18 19:40:23 +04:00
Anton Romanov
dc5abe1508 show authors 2018-12-18 19:23:15 +04:00
Anton Romanov
c88ce3ac37 confirm delete paper 2018-12-18 18:47:15 +04:00
Anton Romanov
c2c420027b add papers navigation 2018-12-18 18:05:30 +04:00
Anton Romanov
3e8b74f362 fix submit form 2018-12-17 17:56:48 +04:00
Anton Romanov
d5121c895e fix email notification 2018-12-17 17:29:06 +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
1f264331fa fix npe 2018-12-05 17:36:53 +04:00
Anton Romanov
7b8f7a2047 format dates 2018-12-05 17:06:56 +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
7794738f63 fix js 2018-12-04 14:49:23 +04: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
aee396f686 Merge branch '14-filter-frontend' into 'master'
Resolve "Фильтр статей"

Closes #14

See merge request romanov73/ng-tracker!18
2018-11-23 16:40:15 +00:00
Anton Romanov
13f9081aee fix failed commit 2018-11-23 20:37:24 +04:00
Anton Romanov
5fa5d670a5 show paper list in mvc 2018-11-23 16:45:40 +04:00
Alyona
f5068f8be9 filter 2018-11-23 14:17:16 +04:00
Alyona
a9ea796bbb Merge branch 'master' into 14-filter-frontend 2018-11-23 14:12:37 +04:00
Alyona
df6bc223aa Merge remote-tracking branch 'origin/master' 2018-11-23 14:10:49 +04:00
Alyona
5eff1bac81 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. 2018-11-23 14:10:36 +04:00
Elena
8fc6d3b569 задача 10(new) 2018-11-23 14:05:23 +04:00
Elena
51e84e22a6 задача 10 2018-11-23 13:53:20 +04:00
Elena
fe6e52a19c Merge branch 'master' into 10-savePaper 2018-11-23 12:39:36 +04:00
Anton Romanov
e84e542309 fix colors 2018-11-22 21:48:36 +04:00