Nightblade73
|
34033fac5f
|
#59 added filtration
|
2019-04-19 17:36:46 +04:00 |
|
Nightblade73
|
713e50043e
|
Merge remote-tracking branch 'remotes/origin/dev' into 69-take-part-conf
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
2019-04-19 14:24:32 +04:00 |
|
Anton Romanov
|
5a55e3cfc8
|
Merge branch '42--2' into 'dev'
Resolve "Форма добавления и фильтра участников гранта"
Closes #42
See merge request romanov73/ng-tracker!44
|
2019-04-18 18:40:37 +00:00 |
|
Семенова Мария
|
a2dca6b7c6
|
Merge branch 'dev' into paper-latex-editing
# Conflicts:
# src/main/java/ru/ulstu/paper/model/Paper.java
# src/main/java/ru/ulstu/paper/model/PaperDto.java
# src/main/java/ru/ulstu/paper/service/PaperService.java
# src/main/resources/db/changelog-master.xml
# src/main/resources/templates/papers/paper.html
|
2019-04-18 18:20:51 +04:00 |
|
Nightblade73
|
96431701df
|
#69 added button disabling take part, if cur user already taken part
|
2019-04-18 15:38:45 +04:00 |
|
Nightblade73
|
8fd352aaa4
|
#69 added styles
|
2019-04-18 14:33:49 +04:00 |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
2019-04-17 13:30:14 +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
|
909c657c89
|
#58 added delete confirm
|
2019-04-15 15:48:17 +04:00 |
|
ASH
|
1f36e04cd3
|
#74 fully adding tags
|
2019-04-14 21:24:22 +04:00 |
|
Nightblade73
|
8cfc64ea85
|
#55 added delete input style
|
2019-04-14 20:42:11 +04:00 |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
2019-04-11 22:37:32 +04:00 |
|
Anton Romanov
|
b9af7c20c7
|
fix grids
|
2019-04-06 00:11:49 +04:00 |
|
T-Midnight
|
566b7821d1
|
#42 merge dev into 42
|
2019-04-04 09:43:26 +04:00 |
|
T-Midnight
|
8a7117d713
|
#42 Add leader and authors
|
2019-04-04 09:38:18 +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 |
|
Семенова Мария
|
cf9a7f895f
|
pdf generating
|
2019-03-25 13:17:34 +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 |
|
Семенова Мария
|
10fe7e8a4e
|
paper files list fragment, latex attachs upload
|
2019-03-24 12:42:21 +04:00 |
|
Семенова Мария
|
c86f58d1b2
|
tab with latex editing
|
2019-03-23 22:49:11 +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 |
|