Commit Graph

368 Commits

Author SHA1 Message Date
Семенова Мария
8dc5eec35c #13 add files to db 2019-03-18 19:17:28 +04:00
Nightblade73
fd22aecd22 #53 added supporting bootstrap style 2019-03-18 18:41:59 +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
Семенова Мария
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
c25c17d8ba Rename title 2019-03-15 12:19:25 +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
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
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
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
cec13bb677 some layout fix 2018-12-30 19:23:11 +04:00
Anton Romanov
2cac98be50 fix enum field name 2018-12-29 09:58:37 +04:00
Anton Romanov
ce78f8ad66 some refactor 2018-12-28 13:57:20 +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
2f68339ba2 Add thymeleaf template 2018-12-24 15:18:52 +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
Anton Romanov
6e14860c34 fix paper status template 2018-12-20 23:30:25 +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
d5121c895e fix email notification 2018-12-17 17:29:06 +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
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
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
Anton Romanov
7f1fb168e1 fix colors 2018-11-22 21:31:41 +04:00
Anton Romanov
1b2db5b5d4 Merge remote-tracking branch 'origin/master' 2018-11-22 11:20:08 +04:00
Anton Romanov
ccd07305ec add mertica 2018-11-22 11:19:50 +04:00
Anton Romanov
724dd6a78a remove empty page 2018-11-21 15:47:26 +04:00
Anton Romanov
161fab55de add toolbar 2018-11-21 15:47:14 +04:00
Anton Romanov
0aec0c3c8e Merge remote-tracking branch 'origin/master' 2018-11-21 15:42:20 +04:00
Anton Romanov
29586c9313 close failed papers 2018-11-21 15:40:20 +04:00
T-Midnight
f6647d6752 Create grant page 2018-11-21 15:28:41 +04:00
Anton Romanov
4e3e882f76 Merge branch '30-main-grants-page' into 'master'
Resolve "Создать страницу грантов"

Closes #30

See merge request romanov73/ng-tracker!17
2018-11-21 08:51:11 +00:00
T-Midnight
d13644d67d Update dashboard for grants 2018-11-19 12:16:39 +04:00
Anton Romanov
6adc96761b fix delete button 2018-11-18 14:29:41 +04:00
Anton Romanov
9a0fa5a170 fix delete button 2018-11-17 12:31:22 +04:00
Anton Romanov
2d78753b06 show events 2018-11-17 11:56:52 +04:00
Anton Romanov
ec9009be10 show toolbar buttons 2018-11-14 17:04:40 +04:00
Anton Romanov
74d9c5cd20 show toolbar buttons 2018-11-14 17:04:29 +04:00
Anton Romanov
863991953c show paper status 2018-11-14 17:04:13 +04:00
Anton Romanov
06864c7ec8 read dashboard 2018-11-14 15:15:23 +04:00
Alyona
02f762b4f1 filter 2018-11-14 08:55:46 +04:00
Anton Romanov
600d58d416 Merge branch '20-' into 'master'
Resolve "Реализовать периодические события"

Closes #20

See merge request romanov73/ng-tracker!15
2018-11-10 21:44:36 +00:00
Anton Romanov
f0ac06c900 refactor and db changes 2018-11-11 01:29:06 +04:00
Anton Romanov
7cffbef9e2 delete paper 2018-11-10 23:15:35 +04:00
T-Midnight
4da039f9b0 Create dashboard for grants 2018-11-10 21:55:09 +04:00
Elena
2db572f284 Задача №10 2018-11-09 15:43:25 +04:00
Anton Romanov
d5f9a81b46 remove styles from email template 2018-11-09 15:37:58 +04:00
Anton Romanov
6aa5f807b7 move styles to body 2018-11-09 15:21:03 +04:00
Anton Romanov
1b53debc88 Merge branch 'master' into 21-Event-status
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2018-11-09 15:08:10 +04:00
Anton Romanov
5c54817fc6 fix styles 2018-11-09 15:05:39 +04:00
Anton Romanov
1211b0db29 add styles in email templates 2018-11-09 14:53:24 +04:00
Elena
0f9bbc13cc Merge branch 'master' into 10-savePaper 2018-11-09 13:43:08 +04:00
Elena
65d788512b Задача №10 2018-11-09 13:42:28 +04:00
Anton Romanov
67881262be add notification templates 2018-11-09 10:04:50 +04:00
Anton Romanov
cd09cf6d60 add toolbar 2018-11-08 21:58:10 +04:00
Anton Romanov
e554f9ea4c fix paths 2018-11-08 20:34:09 +04:00
Anton Romanov
4c43776528 add config parameter 2018-11-08 20:08:26 +04:00
Anton Romanov
bd78be93ab add paper create strategy 2018-11-08 19:36:50 +04:00
Alyona
8fe9f6625c changelog 2018-10-31 20:06:27 +04:00
Anton Romanov
d721907c24 Merge branch 'master' into 4-show-time-line
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2018-10-30 23:29:18 +04:00
Anton Romanov
02499c0aae fix db 2018-10-30 23:26:55 +04:00
Anton Romanov
128b147bf2 Revert "remove liquibase"
This reverts commit 43917c0
2018-10-30 23:07:01 +04:00
Anton Romanov
679756b02b Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line 2018-10-30 23:04:49 +04:00
Anton Romanov
4e7c0259d4 Revert "remove liquibase"
This reverts commit 43917c0
2018-10-30 23:04:21 +04:00
Anton Romanov
7388b2cb27 add database column 2018-10-27 23:16:14 +04:00
Anton Romanov
5e7cff8ac6 some fix 2018-10-25 10:27:57 +04:00
Alyona
75c33bb065 finish deadline 2018-10-25 08:53:48 +04:00
Alyona
4f49e7ae32 finish deadline 2018-10-25 08:53:29 +04:00
Alyona
92b807f6b9 Merge branch 'master' into 8-Deadline 2018-10-25 08:44:25 +04:00
Alyona
cd6b82f892 partially add deadline 2018-10-25 08:41:37 +04:00
Anton Romanov
275348563d use html5 datetime pickers 2018-10-18 11:21:26 +04:00
Elena
29f836fcc8 Задача №7 2018-10-18 10:38:04 +04:00
Anton Romanov
f9c977177a Merge branch '6-authors-list-Matveeva' into 'master'
Resolve "Список авторов для статьи"

Closes #6

See merge request romanov73/ng-tracker!9
2018-10-18 04:49:10 +00:00
Anton Romanov
76666912d7 fix buttons size 2018-10-11 19:49:16 +04:00
Anton Romanov
47e906fddc fix styles 2018-10-11 15:39:57 +04:00
Anton Romanov
e163529d66 load paper statuses 2018-10-11 10:03:44 +04:00
Anton Romanov
2464915b62 fix progress background 2018-10-11 09:05:41 +04:00
Elena
b1c98aba45 Задача №6 2018-10-10 23:09:45 +04:00
Anton Romanov
0219b0ce28 fix paper view 2018-10-10 17:05:54 +04:00
Elena
31c7c8571e Задача №5 new 2018-10-10 15:30:47 +04:00
Elena
95e366ca20 Merge branch 'master' into 5-Matveeva-Page
# Conflicts:
#	src/main/resources/templates/paper.html
#	src/main/resources/templates/papers.html
2018-10-10 10:09:07 +04:00
Elena
f9f287c190 Задача №5 2018-10-04 10:39:27 +04:00
Anton Romanov
7db839aee9 Merge branch 'master' into 27-file-upload 2018-10-02 11:11:13 +04:00
Anton Romanov
bf73be3b70 add messages 2018-10-02 10:58:41 +04:00
Anton Romanov
dd5ab38c40 add example for file uploading 2018-10-01 13:54:11 +04:00
Anton Romanov
a9f4e51558 minimize scripts 2018-09-29 09:22:48 +04:00
Anton Romanov
4009a5cf2b fix error pages 2018-09-27 21:32:16 +04:00
Anton Romanov
a3668ddcd3 move pages 2018-09-27 12:11:25 +04:00
Anton Romanov
550cc4cdf3 some refactor 2018-09-27 10:35:22 +04:00
Anton Romanov
879f388e66 Merge branch 'master' into 3-ui
# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
2018-09-27 10:03:00 +04:00
Anton Romanov
948305e4d9 Merge branch 'master' into 3-ui
# Conflicts:
#	src/main/resources/templates/index.html
#	src/main/resources/templates/papers.html
2018-09-27 10:02:49 +04:00
Alyona
fae5666694 Merge branch 'master' into 5-Page-of-paper
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:44:36 +04:00
Alyona
5b16ac785c Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:41:33 +04:00
Alyona
0814081187 Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:11:43 +04:00
Alyona
e4e37454ed Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:11:19 +04:00
Alyona
48d3b57503 add paper page 2018-09-26 16:04:31 +04:00
Alyona
a93a19bcfe Alyona-Test 2018-09-25 17:13:01 +04:00
Elena
5c0e06e6b5 Тестовое задание 2018-09-25 16:45:01 +04:00
Anton Romanov
1af2f9645a change ports 2018-09-08 10:19:21 +04:00
Anton Romanov
d42c6ece7e Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line 2018-09-08 10:07:21 +04:00
Anton Romanov
0ce90e2780 Merge branch 'master' into 4-show-time-line 2018-09-08 09:54:14 +04:00
Anton Romanov
3688423602 path to timeline 2018-09-08 09:53:34 +04:00
Anton Romanov
1259b6ff2b fix papers font 2018-09-08 09:50:13 +04:00
Anton Romanov
09e8618bb3 add timeline page 2018-09-05 21:58:04 +04:00
Anton Romanov
294ed1838a fix paper colors 2018-09-05 13:45:20 +04:00
Anton Romanov
5e4f137dba add method for create paper 2018-09-05 13:31:51 +04:00
Anton Romanov
43e446e871 get paper list 2018-09-05 11:27:22 +04:00
Anton Romanov
1d74a7cab9 add timeline page 2018-06-10 13:43:40 +04:00
Anton Romanov
da1fbc3124 send notification 2018-06-10 01:49:38 +04:00
Anton Romanov
43917c043d remove liquibase 2018-06-09 22:58:32 +04:00
Anton Romanov
9706944515 fix ports 2018-06-09 22:41:00 +04:00
885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 2018-05-20 08:05:21 +02:00
Anton Romanov
2fda487555 add paper authors 2018-05-05 14:49:34 +04:00
Anton Romanov
b140a61a9b fix papers crud 2018-05-05 10:57:02 +04:00
Anton Romanov
d8fa601103 add file uploading 2018-05-05 00:24:48 +04:00
Anton Romanov
4eaa7b3f59 add big logo 2018-05-04 18:09:29 +04:00
Anton Romanov
0a2a8c503c add ci 2018-05-04 17:54:46 +04:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00