310 Commits

Author SHA1 Message Date
Nightblade73
0cc8de2d32 added delete method of conference 2019-04-15 10:36:55 +04:00
Nightblade73
f88f035e65 little fix 2019-04-14 21:34:39 +04:00
Nightblade73
8cfc64ea85 added delete input style 2019-04-14 20:42:11 +04:00
Anton Romanov
34499abd60 fix remove deadline in other JPA operation 2019-04-13 22:59:59 +04:00
Nightblade73
9711febefb added delete deadline 2019-04-13 13:02:36 +04:00
Nightblade73
b4a2a8086d remove verification of empty deadline list 2019-04-12 15:51:06 +04:00
Nightblade73
c308a5e5af Navigation's method "hasErrors" don't work. it returns String, not redirection. 2019-04-09 14:47:14 +04:00
Nightblade73
689a7799e3 added method in controller 2019-04-08 22:04:30 +04:00
Anton Romanov
7dca991c2f Merge branch '55-new-conf' into 'dev'
Resolve "Добавление новой конференции"

Closes 

See merge request 
2019-04-08 03:33:40 +00:00
Anton Romanov
e350f8b3c1 refactor controller navigation, fix conference edit url 2019-04-08 07:40:26 +04:00
Nightblade73
c49b56916c added initialization of fields in ConferenceDto 2019-04-07 10:08:13 +04:00
Nightblade73
db43da9ec0 added nav controller 2019-04-07 10:01:44 +04:00
Nightblade73
3e5aeaf290 fast fixes 2019-04-06 14:41:10 +04:00
Nightblade73
926cd02096 fixed adding to DB 2019-04-06 11:05:30 +04:00
Anton Romanov
b9af7c20c7 fix grids 2019-04-06 00:11:49 +04:00
Anton Romanov
e0ca29fbab fix wrong entity 2019-04-05 21:47:42 +04:00
Nightblade73
eb524d49d0 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 check CI 2019-04-05 18:01:12 +04:00
Anton Romanov
c7cdbe9044 add tasks, modify build script for passing application properties 2019-04-05 17:35:17 +04:00
Nightblade73
67bfad22f9 added create and update methods 2019-04-05 16:30:45 +04:00
Anton Romanov
54edeb0559 fix user abbreviate 2019-04-05 13:39:53 +04:00
Anton Romanov
91d2168012 show paper formatted lines 2019-04-05 13:34:38 +04:00
Nightblade73
d6b7fe790a added transition to the page new conference 2019-04-05 13:21:15 +04:00
Nightblade73
9d69f75530 fixes 2019-04-04 20:26:38 +04:00
Nightblade73
2d04b1b43a added findAll method in ConferenceService 2019-04-04 17:58:22 +04:00
Nightblade73
d189891e8c added ConferenceFilterDto 2019-04-04 17:47:18 +04:00
Nightblade73
e3bbade40b added ConferenceDto 2019-04-04 17:39:28 +04:00
Nightblade73
dc12a671d2 added setters/getters 2019-04-04 12:50:12 +04:00
Nightblade73
be2dd291f6 added conference model without user's participation and deposit. May be needed new user model. 2019-04-04 12:48:05 +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 created classes 2019-04-02 10:53:09 +04:00
Anton Romanov
5ffb2d547e Merge branch 'dev' into 81-students-create-database
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2019-04-01 09:42:40 +04:00
Anton Romanov
61d4c67aac Merge branch '56-creating-tables-in-DB' into 'dev'
Resolve "Создание таблиц в БД по модулю конференций"

Closes 

See merge request 
2019-04-01 05:27:43 +00:00
Anton Romanov
c2dc080d23 Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"

Closes 

See merge request 
2019-04-01 05:17:39 +00:00
ASH
4e89c65c22 adding main tables 2019-03-31 18:58:57 +04:00
ASH
2ad03a5689 adding dashboard 2019-03-31 13:47:15 +04:00
Nightblade73
e93f618779 added database schema 2019-03-31 13:12:43 +04:00
Anton Romanov
76d4c15db5 Merge branch '18-paper-timeline' into 'dev'
Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей"

Closes 

See merge request 
2019-03-30 07:12:26 +00:00
Anton Romanov
e98445bb48 Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций"

Closes 

See merge request 
2019-03-30 07:10:47 +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 
2019-03-28 11:58:02 +00:00
Anton Romanov
103ff05846 fix displaying commits 2019-03-28 15:53:31 +03:00
Anton Romanov
539095c89e partially restored commits page 2019-03-28 14:59:35 +04:00
Anton Romanov
7b0b7a041a hide mvc controllers from api 2019-03-28 14:45:39 +04:00
Anton Romanov
c70c35f4f3 add no records message 2019-03-28 14:36:58 +04:00
Семенова Мария
2f0c461524 add paper events 2019-03-28 12:40:10 +04:00
Nightblade73
01b082c31b changed style like in module "papers" 2019-03-28 10:15:15 +04:00
Anton Romanov
e74fcb316c small external link 2019-03-27 13:27:49 +04:00
ASH
af3c0c0faa fixing layout n adding 2019-03-26 10:49:26 +04:00
Nightblade73
79cfd7c0ab added pagination style, css fixes 2019-03-25 11:41:36 +04:00