Васин Антон
|
ca3e87a8c5
|
#96 edit project blank page
|
5 years ago |
T-Midnight
|
506fa01fab
|
Revert: #42 merge with dev
|
5 years ago |
|
T-Midnight
|
97d7d00098
|
#42 merge with dev
|
5 years ago |
|
T-Midnight
|
1e6b3cba3a
|
#42 delete blank lines, fix js, fix leaderId validation
|
5 years ago |
Nightblade73
|
8564f2cf34
|
#69 managed to create a connection through a new entity
|
5 years ago |
Anton Romanov
|
487aa578a7
|
Merge branch '86-projects-main-page' into 'dev'
Resolve "Создать страницу списка проектов"
Closes #86
See merge request romanov73/ng-tracker!53
|
5 years ago |
|
Васин Антон
|
f5c1bb940c
|
#86 projects main page
|
5 years ago |
|
Nightblade73
|
14c28050c7
|
#65 changed interface
|
5 years ago |
|
Nightblade73
|
81d07645c2
|
#65 added delete method of article, fixed copyFromDto method
|
5 years ago |
|
Anton Romanov
|
3facc0c26e
|
Merge branch '74-students-add-new-task' into 'dev'
Resolve "Добавление новой задачи"
Closes #78 and #74
See merge request romanov73/ng-tracker!47
|
5 years ago |
|
Anton Romanov
|
d81d1cf72c
|
#74 some code fixes
|
5 years ago |
|
Nightblade73
|
d4b38d314f
|
#66 fixed bug, when attach-article lose what needed to attach after add or remove deadline
|
5 years ago |
anastasia shulga
|
95f70f425a
|
Update2 TagService.java
|
5 years ago |
|
anastasia shulga
|
dbd61ce80c
|
Update TagService.java
|
5 years ago |
|
Nightblade73
|
dca644eba1
|
#66 added handling of adding articles not added to the picker.
|
5 years ago |
|
Nightblade73
|
fbf9a7943b
|
#66 changed from Set to List
|
5 years ago |
|
Nightblade73
|
735cbb5f7b
|
#66 added front-end part
|
5 years ago |
|
Nightblade73
|
909c657c89
|
#58 added delete confirm
|
5 years ago |
|
Nightblade73
|
0cc8de2d32
|
#58 added delete method of conference
|
5 years ago |
|
Nightblade73
|
f88f035e65
|
#55 little fix
|
5 years ago |
ASH
|
1f36e04cd3
|
#74 fully adding tags
|
5 years ago |
|
Nightblade73
|
8cfc64ea85
|
#55 added delete input style
|
5 years ago |
|
ASH
|
d6a11a5902
|
#74 fixing codestyle and tags
|
5 years ago |
|
Anton Romanov
|
8b2a559d37
|
#42 fix thymeleaf expressions
|
5 years ago |
|
Anton Romanov
|
34499abd60
|
#62 fix remove deadline in other JPA operation
|
5 years ago |
|
Nightblade73
|
9711febefb
|
#55 added delete deadline
|
5 years ago |
|
T-Midnight
|
1756f29505
|
#42 filter authors by leader and degree
|
5 years ago |
|
Nightblade73
|
b4a2a8086d
|
#62 remove verification of empty deadline list
|
5 years ago |
|
Anton Romanov
|
4955e9a637
|
#4--2 merge with dev
|
5 years ago |
|
Anton Romanov
|
cafb3abcee
|
#4--2 merge with dev
|
5 years ago |
|
T-Midnight
|
bd3513118c
|
#42 this don't work
|
5 years ago |
|
T-Midnight
|
f7d766f02d
|
#42 rename birth_date column
|
5 years ago |
|
ASH
|
5eae7305c4
|
#74 codestyle
|
5 years ago |
|
ASH
|
f019806a8e
|
#74 fixing adding and db everything added except tags
|
5 years ago |
|
T-Midnight
|
e8461e26eb
|
#42 fix birthDate and degree to User
|
5 years ago |
|
T-Midnight
|
51c755ac07
|
#42 method hasErrors didn't work, return to the previous state
|
5 years ago |
|
ASH
|
9b697c6f3f
|
#74 adding models, controllers and services
|
5 years ago |
|
T-Midnight
|
e2e10477ac
|
#42 delete GrantStatusDto
|
5 years ago |
|
Nightblade73
|
c308a5e5af
|
#55 Navigation's method "hasErrors" don't work. it returns String, not redirection.
|
5 years ago |
|
Nightblade73
|
689a7799e3
|
#55 added method in controller
|
5 years ago |
|
Anton Romanov
|
7dca991c2f
|
Merge branch '55-new-conf' into 'dev'
Resolve "Добавление новой конференции"
Closes #55
See merge request romanov73/ng-tracker!43
|
5 years ago |
|
Anton Romanov
|
e350f8b3c1
|
#55 refactor controller navigation, fix conference edit url
|
5 years ago |
|
Nightblade73
|
c49b56916c
|
#55 added initialization of fields in ConferenceDto
|
5 years ago |
|
Nightblade73
|
db43da9ec0
|
#55 added nav controller
|
5 years ago |
|
Nightblade73
|
3e5aeaf290
|
#55 fast fixes
|
5 years ago |
|
Nightblade73
|
926cd02096
|
#55 fixed adding to DB
|
5 years ago |
|
Anton Romanov
|
b9af7c20c7
|
fix grids
|
5 years ago |
|
T-Midnight
|
7465803162
|
#42 add columns 'birth_date'&'degree' to User
|
5 years ago |
|
Anton Romanov
|
e0ca29fbab
|
#83 fix wrong entity
|
5 years ago |
|
Nightblade73
|
eb524d49d0
|
#55 added html side, don't work, because can't parse date, like in deadlines
|
5 years ago |
|
Anton Romanov
|
72add3638b
|
#83 check CI
|
5 years ago |
|
Anton Romanov
|
c7cdbe9044
|
#83 add tasks, modify build script for passing application properties
|
5 years ago |
|
Nightblade73
|
67bfad22f9
|
#55 added create and update methods
|
5 years ago |
|
Anton Romanov
|
2cf3e52596
|
#73 merge dev into jdk11
|
5 years ago |
|
Anton Romanov
|
54edeb0559
|
#82 fix user abbreviate
|
5 years ago |
|
Anton Romanov
|
91d2168012
|
#82 show paper formatted lines
|
5 years ago |
|
Nightblade73
|
d6b7fe790a
|
#55 added transition to the page new conference
|
5 years ago |
|
Nightblade73
|
9d69f75530
|
#55 fixes
|
5 years ago |
|
Nightblade73
|
2d04b1b43a
|
#55 added findAll method in ConferenceService
|
5 years ago |
|
Nightblade73
|
d189891e8c
|
#55 added ConferenceFilterDto
|
5 years ago |
|
Nightblade73
|
e3bbade40b
|
#55 added ConferenceDto
|
5 years ago |
|
Nightblade73
|
dc12a671d2
|
#55 added setters/getters
|
5 years ago |
|
Nightblade73
|
be2dd291f6
|
#55 added conference model without user's participation and deposit. May be needed new user model.
|
5 years ago |
|
T-Midnight
|
99a8550696
|
#42 merge dev into 42
|
5 years ago |
|
T-Midnight
|
566b7821d1
|
#42 merge dev into 42
|
5 years ago |
|
T-Midnight
|
8a7117d713
|
#42 Add leader and authors
|
5 years ago |
Семенова Мария
|
ded0ab482a
|
add nonstopmode
|
5 years ago |
|
Anton Romanov
|
4104aa04cd
|
fixes for wrong build. entities always extends BaseEntity, tables must contains version column
|
5 years ago |
|
Nightblade73
|
0428bad048
|
#57 created classes
|
5 years ago |
|
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 |
|
Семенова Мария
|
0c34571354
|
remove JLR library using
|
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 |
|
Семенова Мария
|
cf9a7f895f
|
pdf generating
|
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 |
|
Семенова Мария
|
10fe7e8a4e
|
paper files list fragment, latex attachs upload
|
5 years ago |
|
Семенова Мария
|
c86f58d1b2
|
tab with latex editing
|
5 years ago |
|
Семенова Мария
|
c21e8afc1f
|
latex text in paper
|
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 |