T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
2019-04-17 13:25:10 +04:00 |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
2019-04-13 23:56:24 +04:00 |
|
T-Midnight
|
1756f29505
|
#42 filter authors by leader and degree
|
2019-04-13 12:39:53 +04:00 |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
2019-04-11 22:37:32 +04:00 |
|
T-Midnight
|
bd3513118c
|
#42 this don't work
|
2019-04-11 21:42:28 +04:00 |
|
T-Midnight
|
99a8550696
|
#42 merge dev into 42
|
2019-04-04 09:44:51 +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 |
|
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 |
|
Семенова Мария
|
e6bf603edc
|
#33 url in paper
|
2019-03-18 23:31:33 +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 |
|
Семенова Мария
|
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 |
|
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
|
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 |
|