Anton Romanov
|
5ffb2d547e
|
Merge branch 'dev' into 81-students-create-database
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
5 years ago |
|
Anton Romanov
|
61d4c67aac
|
Merge branch '56-creating-tables-in-DB' into 'dev'
Resolve "Создание таблиц в БД по модулю конференций"
Closes #56
See merge request romanov73/ng-tracker!40
|
5 years ago |
|
Anton Romanov
|
c2dc080d23
|
Merge branch '71-add-task-layout' into 'dev'
Resolve "Верстка страницы добавления новой задачи, ПУ и списка задач"
Closes #71
See merge request romanov73/ng-tracker!29
|
5 years ago |
ASH
|
4e89c65c22
|
#81 adding main tables
|
5 years ago |
|
ASH
|
2ad03a5689
|
#71 adding dashboard
|
5 years ago |
Nightblade73
|
e93f618779
|
#56 added database schema
|
5 years ago |
|
Anton Romanov
|
76d4c15db5
|
Merge branch '18-paper-timeline' into 'dev'
Resolve "Реализовать добавление в таймлайн событий по дедлайнам статей"
Closes #18
See merge request romanov73/ng-tracker!39
|
5 years ago |
|
Anton Romanov
|
e98445bb48
|
Merge branch '53-vyorstka-stranitsy-spiska-konferentsiy' into 'dev'
Resolve "Вёрстка страницы списка конференций"
Closes #53
See merge request romanov73/ng-tracker!33
|
5 years ago |
Семенова Мария
|
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
|
5 years ago |
|
Anton Romanov
|
ba64b7df16
|
Merge branch 'restore-commits-page' into 'dev'
partially restored commits page
See merge request romanov73/ng-tracker!38
|
5 years ago |
|
Anton Romanov
|
103ff05846
|
fix displaying commits
|
5 years ago |
|
Anton Romanov
|
539095c89e
|
partially restored commits page
|
5 years ago |
|
Anton Romanov
|
7b0b7a041a
|
#80 hide mvc controllers from api
|
5 years ago |
|
Anton Romanov
|
c70c35f4f3
|
#80 add no records message
|
5 years ago |
|
Семенова Мария
|
2f0c461524
|
#18 add paper events
|
5 years ago |
|
Nightblade73
|
01b082c31b
|
#53 changed style like in module "papers"
|
5 years ago |
|
Anton Romanov
|
e74fcb316c
|
#33 small external link
|
5 years ago |
|
ASH
|
af3c0c0faa
|
#71 fixing layout n adding
|
5 years ago |
|
Nightblade73
|
79cfd7c0ab
|
#53 added pagination style, css fixes
|
5 years ago |
|
Nightblade73
|
cc1f5c00c5
|
#53 adapted, refactor css
|
5 years ago |
|
Nightblade73
|
99468a0cea
|
#53 added actual.html, css fixes
|
5 years ago |
|
Nightblade73
|
bff824bc06
|
#53 added control panel
|
5 years ago |
|
Nightblade73
|
ea4e25aded
|
#53 added years filter forms
|
5 years ago |
|
Nightblade73
|
edd6aee00f
|
#53 fast fix
|
5 years ago |
|
Nightblade73
|
50dbe8cb8f
|
#53 added custom checkboxes, added selection of all conferences
|
5 years ago |
|
Семенова Мария
|
b90e7c054b
|
#33 link in new tab
|
5 years ago |
|
Семенова Мария
|
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
|
5 years ago |
|
Anton Romanov
|
482e74e10e
|
#13 reduce of code
|
5 years ago |
|
Anton Romanov
|
7012c00c5f
|
#13 fix condition
|
5 years ago |
|
Семенова Мария
|
a0b65f341b
|
#13 streams refactoring
|
5 years ago |
|
Семенова Мария
|
5da9de1bab
|
#13 rename 'deleted', move creating fileDto to service
|
5 years ago |
|
Семенова Мария
|
c702e2abb4
|
#13 fileDataDto instead of Object[]
|
5 years ago |
|
Nightblade73
|
9182a71015
|
#53 added ping style
|
5 years ago |
|
Nightblade73
|
d356c21944
|
#53 added buttons, added bottom pagination
|
5 years ago |
|
Nightblade73
|
89e0d1a291
|
#53 customization css styles
|
5 years ago |
|
Nightblade73
|
cb673d8782
|
#53 remake of conference list without table
|
5 years ago |
|
Nightblade73
|
1364e8e84d
|
#53 added multi selection, added selection of all items
|
5 years ago |
|
Семенова Мария
|
3c068df201
|
#13 some refactoring
|
5 years ago |
|
Nightblade73
|
5dc54dda8b
|
#53 added supporting russian language, added linkable row in table
|
5 years ago |
|
Семенова Мария
|
e6bf603edc
|
#33 url in paper
|
5 years ago |
|
Семенова Мария
|
1425cceb63
|
#13 download files
|
5 years ago |
|
Семенова Мария
|
8dc5eec35c
|
#13 add files to db
|
5 years ago |
|
Nightblade73
|
fd22aecd22
|
#53 added supporting bootstrap style
|
5 years ago |
|
Семенова Мария
|
4fb8061653
|
#13 addNewFile js function
|
5 years ago |
|
Семенова Мария
|
e609b27518
|
Merge branch 'dev' into 13-paper-files
# Conflicts:
# src/main/java/ru/ulstu/paper/model/PaperDto.java
|
5 years ago |
|
Семенова Мария
|
cb394edf90
|
#13 file list on paper page
|
5 years ago |
T-Midnight
|
29df7120bf
|
Delete DeadlineDTO and update usages
|
5 years ago |
|
Семенова Мария
|
0764d961fa
|
#13 add fileDataDto
|
5 years ago |
|
Семенова Мария
|
7b601c744f
|
#13 change model, schema
|
5 years ago |
|
Nightblade73
|
6296b661a9
|
#53 added conference js file
|
5 years ago |
|
Nightblade73
|
a236fc50bc
|
#53 added datatables lib support
|
5 years ago |
|
T-Midnight
|
99d85a5648
|
Add new status for grant
|
5 years ago |
|
T-Midnight
|
c25c17d8ba
|
Rename title
|
5 years ago |
|
T-Midnight
|
de96be2471
|
Create Navigation class to avoid "magic strings" and code duplication
|
5 years ago |
|
Anton Romanov
|
90bb94d864
|
add patronymic
|
5 years ago |
|
Anton Romanov
|
48894b2176
|
display user in filter
|
5 years ago |
|
Anton Romanov
|
da7a17ee49
|
add service methods
|
5 years ago |
|
Anton Romanov
|
20ecb47867
|
add timetable link
|
5 years ago |
|
ASH
|
bd975c53f3
|
#71 adding pages and layout
|
5 years ago |
|
Anton Romanov
|
3169551968
|
Merge branch '54-view-conference' into 'dev'
Resolve "Вёрстка страницы просмотра информации о конференции"
Closes #54
See merge request romanov73/ng-tracker!26
|
5 years ago |
|
Nightblade73
|
5cb865eb70
|
#54 deleted edit btn
|
5 years ago |
|
Nightblade73
|
2fec35264c
|
#54 add back link, css fixes
|
5 years ago |
|
Nightblade73
|
f90d92b19d
|
#54 add custom paper-list
|
5 years ago |
|
Nightblade73
|
d332282e03
|
#54 add custom deadline-list, add edit-button, add edit and delete icons
|
5 years ago |
|
Nightblade73
|
7fff337c3a
|
#54 add member list
|
5 years ago |
|
Nightblade73
|
76ec5add30
|
#54 part of make-up
|
5 years ago |
|
Nightblade73
|
c21a65a075
|
#54 add transitions
|
5 years ago |
|
Anton Romanov
|
42fdb51337
|
fix login
|
5 years ago |
|
Nightblade73
|
93e68b1929
|
#50 creating html page, changing href
|
5 years ago |
|
Anton Romanov
|
cb73340c3f
|
fix css
|
5 years ago |
|
Anton Romanov
|
4226be6406
|
fix props
|
5 years ago |
|
Anton Romanov
|
dd90bd24a9
|
fix props
|
5 years ago |
user
|
285b43c63c
|
header fix
|
5 years ago |
|
Anton Romanov
|
4f47b1beb6
|
fix code
|
5 years ago |
|
Anton Romanov
|
e2c12d9fb2
|
fix code
|
5 years ago |
|
Anton Romanov
|
0fccbdc973
|
add links to papers
|
5 years ago |
|
Anton Romanov
|
39c25c7b20
|
add links to papers
|
5 years ago |
|
Anton Romanov
|
c00390a17b
|
filter dashboard papers
|
6 years ago |
|
Anton Romanov
|
779bc3eafc
|
fix failed conditions
|
6 years ago |
|
Anton Romanov
|
ffb3c65118
|
fix notifications
|
6 years ago |
|
Anton Romanov
|
eab71c1210
|
fix notifications
|
6 years ago |
|
Anton Romanov
|
cec13bb677
|
some layout fix
|
6 years ago |
|
Anton Romanov
|
edc9c7c090
|
sort deadlines
|
6 years ago |
|
Anton Romanov
|
2cac98be50
|
fix enum field name
|
6 years ago |
|
Anton Romanov
|
ebb036ee71
|
some refactor
|
6 years ago |
|
Anton Romanov
|
ce78f8ad66
|
some refactor
|
6 years ago |
|
T-Midnight
|
bcc64cda96
|
Create model folder for grant
|
6 years ago |
|
T-Midnight
|
816d115cc8
|
Hide button "Add Project" when project already exists (not perfect)
|
6 years ago |
|
T-Midnight
|
18ad291e82
|
Made button "delete grant" visible
|
6 years ago |
|
T-Midnight
|
fcbd91760d
|
Rename table grant to grants
|
6 years ago |
|
T-Midnight
|
d7721ce19d
|
Update classes
|
6 years ago |
|
T-Midnight
|
2f68339ba2
|
Add thymeleaf template
|
6 years ago |
|
T-Midnight
|
410d0d9634
|
Create service&repository for Project
|
6 years ago |
|
T-Midnight
|
307b640e8e
|
Create js for grants
|
6 years ago |
|
T-Midnight
|
25278bcdd8
|
Create html fragments
|
6 years ago |
|
T-Midnight
|
a2fa574888
|
Create Controller&Service
|
6 years ago |
|
T-Midnight
|
c2a32d6c27
|
Update ProjectDto
|
6 years ago |
|
T-Midnight
|
9e5f3d7247
|
Add constructor
|
6 years ago |
|
T-Midnight
|
edd38beb67
|
Add function getNextDeadline()
|
6 years ago |
|
T-Midnight
|
eff5344aea
|
Create GrantRepository
|
6 years ago |