Anton Romanov
|
6c492fa955
|
Update README.md
|
6 years ago |
|
Anton Romanov
|
def4f97784
|
fix ci
|
6 years ago |
|
Anton Romanov
|
42fb1a1537
|
fix imports
|
6 years ago |
Alyona
|
8fe9f6625c
|
changelog
|
6 years ago |
|
Alyona
|
0b2824cee6
|
Merge branch 'master' into 21-Event-status
|
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
|
9013baa209
|
Merge branch '4-show-time-line' into 'master'
Resolve "Список периодических событий"
Closes #4
See merge request romanov73/ng-tracker!2
|
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 |
|
Anton Romanov
|
40c668905f
|
Merge branch '12-' into 'master'
Resolve "Реализовать уведомление о смене статуса статьи"
Closes #12
See merge request romanov73/ng-tracker!13
|
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 |
|
Anton Romanov
|
ed2554216d
|
Merge branch '8-' into 'master'
Resolve "Добавить дедлайны"
Closes #8
See merge request romanov73/ng-tracker!8
|
6 years ago |
|
Alyona
|
75c33bb065
|
finish deadline
|
6 years ago |
|
Alyona
|
4f49e7ae32
|
finish deadline
|
6 years ago |
|
Alyona
|
92b807f6b9
|
Merge branch 'master' into 8-Deadline
|
6 years ago |
|
Alyona
|
cd6b82f892
|
partially add deadline
|
6 years ago |
|
Anton Romanov
|
5c0de4bcf4
|
Merge branch '7-dates-Matveeva' into 'master'
Resolve "Отображать даты создания и изменения статей"
Closes #7
See merge request romanov73/ng-tracker!10
|
6 years ago |
|
Anton Romanov
|
275348563d
|
use html5 datetime pickers
|
6 years ago |
Elena
|
29f836fcc8
|
Задача №7
|
6 years ago |
|
Anton Romanov
|
f9c977177a
|
Merge branch '6-authors-list-Matveeva' into 'master'
Resolve "Список авторов для статьи"
Closes #6
See merge request romanov73/ng-tracker!9
|
6 years ago |
|
Anton Romanov
|
76666912d7
|
fix buttons size
|
6 years ago |
|
Anton Romanov
|
47e906fddc
|
fix styles
|
6 years ago |
|
Anton Romanov
|
e163529d66
|
load paper statuses
|
6 years ago |
|
Anton Romanov
|
2464915b62
|
fix progress background
|
6 years ago |
|
Elena
|
b1c98aba45
|
Задача №6
|
6 years ago |
|
Anton Romanov
|
89f4b04a3f
|
Merge branch '5-' into 'master'
Resolve "Верстка страницы статьи"
Closes #5
See merge request romanov73/ng-tracker!5
|
6 years ago |
|
Anton Romanov
|
0219b0ce28
|
fix paper view
|
6 years ago |
|
Elena
|
31c7c8571e
|
Задача №5 new
|
6 years ago |
|
Elena
|
95e366ca20
|
Merge branch 'master' into 5-Matveeva-Page
# Conflicts:
# src/main/resources/templates/paper.html
# src/main/resources/templates/papers.html
|
6 years ago |
|
Elena
|
f9f287c190
|
Задача №5
|
6 years ago |
|
Anton Romanov
|
2a493205f3
|
Merge branch '27-file-upload' into 'master'
Resolve "Пример для загрузки файлов"
Closes #27
See merge request romanov73/ng-tracker!7
|
6 years ago |
|
Anton Romanov
|
7db839aee9
|
Merge branch 'master' into 27-file-upload
|
6 years ago |
|
Anton Romanov
|
bf73be3b70
|
add messages
|
6 years ago |
|
Anton Romanov
|
dd5ab38c40
|
add example for file uploading
|
6 years ago |