Семенова Мария
|
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 |
|
Anton Romanov
|
167de9bf65
|
#73 fix deprecated parameters
|
5 years ago |
|
Anton Romanov
|
993a034527
|
#73 restore authentication
|
5 years ago |
|
Anton Romanov
|
9bd954ea9b
|
#73 fix new thymeleaf syntax
|
5 years ago |
|
Anton Romanov
|
1487affb8e
|
#73 fix deprecated annotations and classes
|
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 |
|
Anton Romanov
|
e74261184f
|
#73 first fixes by update versions
|
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 |
|
T-Midnight
|
42d33d1be8
|
Create setters for GrantDto
|
6 years ago |
|
Anton Romanov
|
469a3ad07d
|
fix display paper title
|
6 years ago |
|
Anton Romanov
|
6e14860c34
|
fix paper status template
|
6 years ago |
|
Anton Romanov
|
823f7a7743
|
try to fix template resolvers, step 4
|
6 years ago |
|
Anton Romanov
|
5a9ccbcfc1
|
try to fix template resolvers, step 3
|
6 years ago |
|
Anton Romanov
|
e8bad4e24e
|
try to fix template resolvers, step 2
|
6 years ago |
|
Anton Romanov
|
7089bd6c42
|
try to fix template resolvers
|
6 years ago |
|
Anton Romanov
|
fbaaac3a91
|
sort filtered papers
|
6 years ago |
|
Anton Romanov
|
fa1c4a9c1c
|
add statuses
|
6 years ago |
|
Anton Romanov
|
468f440d9d
|
fix filer
|
6 years ago |
|
Anton Romanov
|
ec1e3ff052
|
fix scripts
|
6 years ago |
|
Anton Romanov
|
dc5abe1508
|
show authors
|
6 years ago |
|
Anton Romanov
|
c88ce3ac37
|
confirm delete paper
|
6 years ago |
|
Anton Romanov
|
c2c420027b
|
add papers navigation
|
6 years ago |
|
Anton Romanov
|
3e8b74f362
|
fix submit form
|
6 years ago |
|
Anton Romanov
|
d5121c895e
|
fix email notification
|
6 years ago |
|
Anton Romanov
|
05296bb26e
|
fix route
|
6 years ago |
|
Anton Romanov
|
59e2c9b544
|
edit deadlines
|
6 years ago |
|
Anton Romanov
|
54ea705890
|
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
|
6 years ago |
|
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
|
6 years ago |
|
Anton Romanov
|
932cb71e71
|
Merge branch '36-' into 'master'
Resolve "Создать модель грантов"
Closes #36
See merge request romanov73/ng-tracker!21
|
6 years ago |
|
Anton Romanov
|
d71a8d2c83
|
move classes, add deadline to entities, fix db changelogs
|
6 years ago |
|
T-Midnight
|
590cd16abe
|
Create model for grant, deadline and project
|
6 years ago |
|
Anton Romanov
|
35a08ab451
|
save authors
|
6 years ago |
|
Anton Romanov
|
1f264331fa
|
fix npe
|
6 years ago |
|
Anton Romanov
|
7b8f7a2047
|
format dates
|
6 years ago |
|
Anton Romanov
|
54bf5735e5
|
fix create paper
|
6 years ago |
|
Anton Romanov
|
67f440ac8a
|
add rest controller
|
6 years ago |
|
Anton Romanov
|
7794738f63
|
fix js
|
6 years ago |
|
Anton Romanov
|
3d4a7b09f3
|
show status
|
6 years ago |
|
Anton Romanov
|
dfe44ab842
|
add validation
|
6 years ago |
|
Anton Romanov
|
f9670ad0a5
|
pass values for paper
|
6 years ago |
|
Anton Romanov
|
f376fedc64
|
load paper
|
6 years ago |
|
Anton Romanov
|
aee396f686
|
Merge branch '14-filter-frontend' into 'master'
Resolve "Фильтр статей"
Closes #14
See merge request romanov73/ng-tracker!18
|
6 years ago |
|
Anton Romanov
|
13f9081aee
|
fix failed commit
|
6 years ago |
|
Anton Romanov
|
5fa5d670a5
|
show paper list in mvc
|
6 years ago |
Alyona
|
f5068f8be9
|
filter
|
6 years ago |
|
Alyona
|
a9ea796bbb
|
Merge branch 'master' into 14-filter-frontend
|
6 years ago |
|
Alyona
|
df6bc223aa
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Alyona
|
5eff1bac81
|
Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.
|
6 years ago |
Elena
|
8fc6d3b569
|
задача 10(new)
|
6 years ago |
|
Elena
|
51e84e22a6
|
задача 10
|
6 years ago |
|
Elena
|
fe6e52a19c
|
Merge branch 'master' into 10-savePaper
|
6 years ago |
|
Anton Romanov
|
e84e542309
|
fix colors
|
6 years ago |
|
Anton Romanov
|
7f1fb168e1
|
fix colors
|
6 years ago |
|
Anton Romanov
|
4163276da3
|
add paper status
|
6 years ago |
|
Anton Romanov
|
1b2db5b5d4
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
ccd07305ec
|
add mertica
|
6 years ago |
|
Anton Romanov
|
724dd6a78a
|
remove empty page
|
6 years ago |
|
Anton Romanov
|
161fab55de
|
add toolbar
|
6 years ago |
|
Anton Romanov
|
0aec0c3c8e
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
29586c9313
|
close failed papers
|
6 years ago |
|
T-Midnight
|
f6647d6752
|
Create grant page
|
6 years ago |
|
Anton Romanov
|
4e3e882f76
|
Merge branch '30-main-grants-page' into 'master'
Resolve "Создать страницу грантов"
Closes #30
See merge request romanov73/ng-tracker!17
|
6 years ago |
|
Anton Romanov
|
ef32bba684
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
6314ca6ec5
|
notify if paper deadline in future
|
6 years ago |
|
T-Midnight
|
d13644d67d
|
Update dashboard for grants
|
6 years ago |
|
Anton Romanov
|
58299d749d
|
fix for remove event
|
6 years ago |
|
Anton Romanov
|
2dc0b4e27c
|
fix event create conditions
|
6 years ago |
|
Anton Romanov
|
6adc96761b
|
fix delete button
|
6 years ago |
|
Anton Romanov
|
9a0fa5a170
|
fix delete button
|
6 years ago |
|
Anton Romanov
|
2d78753b06
|
show events
|
6 years ago |
|
Anton Romanov
|
ec9009be10
|
show toolbar buttons
|
6 years ago |
|
Anton Romanov
|
74d9c5cd20
|
show toolbar buttons
|
6 years ago |
|
Anton Romanov
|
863991953c
|
show paper status
|
6 years ago |
|
Anton Romanov
|
f587f80eb6
|
fix code
|
6 years ago |
|
Anton Romanov
|
112958a70b
|
fix code
|
6 years ago |
|
Anton Romanov
|
06864c7ec8
|
read dashboard
|
6 years ago |
|
Alyona
|
02f762b4f1
|
filter
|
6 years ago |
|
Anton Romanov
|
2a76acc7ad
|
filter papers
|
6 years ago |
|
Anton Romanov
|
4c0ccbe285
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
9380b74f67
|
move class
|
6 years ago |
|
Anton Romanov
|
600d58d416
|
Merge branch '20-' into 'master'
Resolve "Реализовать периодические события"
Closes #20
See merge request romanov73/ng-tracker!15
|
6 years ago |
|
Anton Romanov
|
190591c031
|
fix scheduler
|
6 years ago |
|
Anton Romanov
|
f0ac06c900
|
refactor and db changes
|
6 years ago |
|
Anton Romanov
|
7cffbef9e2
|
delete paper
|
6 years ago |
|
T-Midnight
|
4da039f9b0
|
Create dashboard for grants
|
6 years ago |
|
Anton Romanov
|
e3b248778c
|
add route
|
6 years ago |
|
Alyona
|
376c820b44
|
fix
|
6 years ago |
|
Alyona
|
e76e7ad864
|
fix
|
6 years ago |
|
Elena
|
2db572f284
|
Задача №10
|
6 years ago |
|
Anton Romanov
|
d5f9a81b46
|
remove styles from email template
|
6 years ago |
|
Anton Romanov
|
6aa5f807b7
|
move styles to body
|
6 years ago |
|
Anton Romanov
|
1b53debc88
|
Merge branch 'master' into 21-Event-status
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
6 years ago |
|
Anton Romanov
|
5c54817fc6
|
fix styles
|
6 years ago |
|
Anton Romanov
|
1211b0db29
|
add styles in email templates
|
6 years ago |
|
Alyona
|
392b2a9657
|
added period event
|
6 years ago |
|
Alyona
|
25707db6cd
|
added period event
|
6 years ago |
|
Elena
|
0f9bbc13cc
|
Merge branch 'master' into 10-savePaper
|
6 years ago |
|
Elena
|
65d788512b
|
Задача №10
|
6 years ago |
|
Alyona
|
f449eeb999
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
Anton Romanov
|
67881262be
|
add notification templates
|
6 years ago |
|
Anton Romanov
|
2bf84dc286
|
move to notification service
|
6 years ago |
|
Anton Romanov
|
34d7927d30
|
fix scheduler code to use service
|
6 years ago |
|
Anton Romanov
|
cd09cf6d60
|
add toolbar
|
6 years ago |
|
Anton Romanov
|
e554f9ea4c
|
fix paths
|
6 years ago |
|
Anton Romanov
|
4c43776528
|
add config parameter
|
6 years ago |
|
Anton Romanov
|
bd78be93ab
|
add paper create strategy
|
6 years ago |
|
Anton Romanov
|
42fb1a1537
|
fix imports
|
6 years ago |
|
Alyona
|
8fe9f6625c
|
changelog
|
6 years ago |
|
Alyona
|
0341a823d2
|
Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts.
|
6 years ago |
|
Alyona
|
92d3067dd3
|
added event status
|
6 years ago |
|
Anton Romanov
|
d721907c24
|
Merge branch 'master' into 4-show-time-line
# Conflicts:
# src/main/resources/db/changelog-master.xml
|
6 years ago |
|
Anton Romanov
|
02499c0aae
|
fix db
|
6 years ago |
|
Anton Romanov
|
128b147bf2
|
Revert "remove liquibase"
This reverts commit 43917c0
|
6 years ago |
|
Anton Romanov
|
679756b02b
|
Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line
|
6 years ago |
|
Anton Romanov
|
4e7c0259d4
|
Revert "remove liquibase"
This reverts commit 43917c0
|
6 years ago |
|
Anton Romanov
|
5766bdadbc
|
Merge branch '11-Message-about-deadlines' into 'master'
Resolve "Реализовать уведомления о дедлайне статьи"
Closes #11
See merge request romanov73/ng-tracker!12
|
6 years ago |
|
Alyona
|
5af8cb1bd3
|
fix
|
6 years ago |
|
Alyona
|
b3f8b334ef
|
fix
|
6 years ago |
|
Alyona
|
d1e6e80f87
|
fix
|
6 years ago |
|
Alyona
|
450cb92d01
|
fix
|
6 years ago |
|
Alyona
|
d0f40da30e
|
fix
|
6 years ago |
|
Alyona
|
92f86e70c9
|
fix
|
6 years ago |
|
Anton Romanov
|
afd854e0cb
|
- make scheduler as a service
- reformat code
- fix cyrillic letter
|
6 years ago |
|
Anton Romanov
|
7388b2cb27
|
add database column
|
6 years ago |
|
Alyona
|
7f54394b44
|
class for send messages about update paper
|
6 years ago |
|
Alyona
|
61c19e5b87
|
add deadlineSсheduler
|
6 years ago |
|
Alyona
|
43740981f2
|
add deadlineDate to models
|
6 years ago |
|
Anton Romanov
|
5e7cff8ac6
|
some fix
|
6 years ago |
|
Alyona
|
75c33bb065
|
finish deadline
|
6 years ago |