Commit Graph

78 Commits

Author SHA1 Message Date
Nightblade73
8cfc64ea85 #55 added delete input style 2019-04-14 20:42:11 +04:00
Anton Romanov
b9af7c20c7 fix grids 2019-04-06 00:11:49 +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
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
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
Nightblade73
01b082c31b #53 changed style like in module "papers" 2019-03-28 10:15:15 +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
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
Семенова Мария
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
Nightblade73
fd22aecd22 #53 added supporting bootstrap style 2019-03-18 18:41:59 +04:00
Семенова Мария
0764d961fa #13 add fileDataDto 2019-03-18 13:00:34 +04:00
Nightblade73
6296b661a9 #53 added conference js file 2019-03-16 14:44:34 +04: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
Anton Romanov
cb73340c3f fix css 2019-03-06 16:19:43 +04:00
user
285b43c63c header fix 2019-03-06 14:25:02 +03:00
T-Midnight
307b640e8e Create js for grants 2018-12-24 11:07:02 +04:00
Anton Romanov
6e14860c34 fix paper status template 2018-12-20 23:30:25 +04:00
Anton Romanov
ec1e3ff052 fix scripts 2018-12-18 19:40:23 +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
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
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
Alyona
f5068f8be9 filter 2018-11-23 14:17:16 +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