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 |
|
Anton Romanov
|
a9f4e51558
|
minimize scripts
|
6 years ago |
|
Anton Romanov
|
4009a5cf2b
|
fix error pages
|
6 years ago |
|
Anton Romanov
|
f7bb4a2c74
|
Merge branch 'refactor-ui' into 'master'
Refactor ui
See merge request romanov73/ng-tracker!6
|
6 years ago |
|
Anton Romanov
|
a3668ddcd3
|
move pages
|
6 years ago |
|
Anton Romanov
|
550cc4cdf3
|
some refactor
|
6 years ago |
|
Anton Romanov
|
7c8fa2b42a
|
Merge branch '3-ui' into 'master'
Resolve "Интерфейс"
Closes #3
See merge request romanov73/ng-tracker!1
|
6 years ago |
|
Anton Romanov
|
879f388e66
|
Merge branch 'master' into 3-ui
# Conflicts:
# src/main/resources/templates/index.html
# src/main/resources/templates/papers.html
|
6 years ago |
|
Anton Romanov
|
948305e4d9
|
Merge branch 'master' into 3-ui
# Conflicts:
# src/main/resources/templates/index.html
# src/main/resources/templates/papers.html
|
6 years ago |
|
Alyona
|
fae5666694
|
Merge branch 'master' into 5-Page-of-paper
# Conflicts:
# src/main/resources/templates/papers.html
|
6 years ago |
|
Alyona
|
5b16ac785c
|
Merge branch 'master' into 23-dashboard
# Conflicts:
# src/main/resources/templates/papers.html
|
6 years ago |
|
Anton Romanov
|
f00a156c45
|
Merge branch '23-dashboard' into 'master'
Resolve "Создать страницу для dashboard статей"
Closes #23
See merge request romanov73/ng-tracker!4
|
6 years ago |
|
Alyona
|
0814081187
|
Merge branch 'master' into 23-dashboard
# Conflicts:
# src/main/resources/templates/papers.html
|
6 years ago |
|
Alyona
|
e4e37454ed
|
Merge branch 'master' into 23-dashboard
# Conflicts:
# src/main/resources/templates/papers.html
|
6 years ago |