Commit Graph

168 Commits

Author SHA1 Message Date
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
Nightblade73
7e4d8d4918 #69 added method take part in conference 2019-04-17 14:51:19 +04:00
Nightblade73
14c28050c7 #65 changed interface 2019-04-17 11:19:23 +04: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
Nightblade73
735cbb5f7b #66 added front-end part 2019-04-16 09:46:24 +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
ASH
1f36e04cd3 #74 fully adding tags 2019-04-14 21:24:22 +04:00
Nightblade73
9711febefb #55 added delete deadline 2019-04-13 13:02:36 +04:00
Nightblade73
b4a2a8086d #62 remove verification of empty deadline list 2019-04-12 15:51:06 +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
ASH
9b697c6f3f #74 adding models, controllers and services 2019-04-09 23:18:39 +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
e350f8b3c1 #55 refactor controller navigation, fix conference edit url 2019-04-08 07:40:26 +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
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
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
ASH
2ad03a5689 #71 adding dashboard 2019-03-31 13:47:15 +04:00
Anton Romanov
e98445bb48 Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций"

Closes #53

See merge request romanov73/ng-tracker!33
2019-03-30 07:10:47 +00: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
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
c70c35f4f3 #80 add no records message 2019-03-28 14:36:58 +04:00
Nightblade73
01b082c31b #53 changed style like in module "papers" 2019-03-28 10:15:15 +04:00
Anton Romanov
e74fcb316c #33 small external link 2019-03-27 13:27:49 +04:00
ASH
af3c0c0faa #71 fixing layout n adding 2019-03-26 10:49:26 +04:00
Nightblade73
79cfd7c0ab #53 added pagination style, css fixes 2019-03-25 11:41:36 +04:00
Nightblade73
cc1f5c00c5 #53 adapted, refactor css 2019-03-24 16:17:26 +04:00
Nightblade73
99468a0cea #53 added actual.html, css fixes 2019-03-24 13:48:34 +04:00
Nightblade73
bff824bc06 #53 added control panel 2019-03-24 12:46:15 +04:00
Nightblade73
ea4e25aded #53 added years filter forms 2019-03-23 15:19:48 +04:00
Nightblade73
edd6aee00f #53 fast fix 2019-03-23 12:52:52 +04:00
Nightblade73
50dbe8cb8f #53 added custom checkboxes, added selection of all conferences 2019-03-23 12:39:53 +04:00
Семенова Мария
b90e7c054b #33 link in new tab 2019-03-23 12:23:30 +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
Семенова Мария
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
Nightblade73
9182a71015 #53 added ping style 2019-03-21 11:30:28 +04:00
Nightblade73
d356c21944 #53 added buttons, added bottom pagination 2019-03-21 09:55:38 +04:00
Nightblade73
89e0d1a291 #53 customization css styles 2019-03-20 21:15:45 +04:00
Nightblade73
cb673d8782 #53 remake of conference list without table 2019-03-20 18:33:15 +04:00
Nightblade73
1364e8e84d #53 added multi selection, added selection of all items 2019-03-20 16:48:55 +04:00
Семенова Мария
3c068df201 #13 some refactoring 2019-03-19 17:59:19 +04:00
Nightblade73
5dc54dda8b #53 added supporting russian language, added linkable row in table 2019-03-19 15:08:45 +04:00