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 |
Alyona
|
48d3b57503
|
add paper page
|
6 years ago |
Anton Romanov
|
5f4e63b96f
|
Merge branch '24-paper-page' into 'master'
Resolve "Создать страницу для редактирования/просмотра статьи"
Closes #24
See merge request romanov73/ng-tracker!3
|
6 years ago |
Alyona
|
a93a19bcfe
|
Alyona-Test
|
6 years ago |
Elena
|
5c0e06e6b5
|
Тестовое задание
|
6 years ago |
Anton Romanov
|
88f42e90b5
|
Update README.md
|
6 years ago |
Anton Romanov
|
1af2f9645a
|
change ports
|
6 years ago |
Anton Romanov
|
d42c6ece7e
|
Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line
|
6 years ago |
Anton Romanov
|
0ce90e2780
|
Merge branch 'master' into 4-show-time-line
|
6 years ago |
Anton Romanov
|
3688423602
|
path to timeline
|
6 years ago |
Anton Romanov
|
1259b6ff2b
|
fix papers font
|
6 years ago |
Anton Romanov
|
b93f7e3f85
|
Update README.md
|
6 years ago |
Anton Romanov
|
818c418565
|
add variable
|
6 years ago |
Anton Romanov
|
cbcc006b13
|
deploy on vps
|
6 years ago |
Anton Romanov
|
09e8618bb3
|
add timeline page
|
6 years ago |
Anton Romanov
|
e9d81fef48
|
sort papers
|
6 years ago |
Anton Romanov
|
294ed1838a
|
fix paper colors
|
6 years ago |
Anton Romanov
|
5e4f137dba
|
add method for create paper
|
6 years ago |
Anton Romanov
|
43e446e871
|
get paper list
|
6 years ago |
Anton Romanov
|
1d74a7cab9
|
add timeline page
|
6 years ago |
Anton Romanov
|
e27e56aa9b
|
fix time
|
6 years ago |
Anton Romanov
|
da1fbc3124
|
send notification
|
6 years ago |
Anton Romanov
|
aa919906aa
|
add event controller
|
6 years ago |
Anton Romanov
|
43917c043d
|
remove liquibase
|
6 years ago |
Anton Romanov
|
9706944515
|
fix ports
|
6 years ago |
Aleksey Filippov
|
885c553153
|
delete orphaned files, migrate to webjars, some fixes and refactoring
|
6 years ago |
Anton Romanov
|
2fda487555
|
add paper authors
|
6 years ago |
Anton Romanov
|
e465651eb2
|
add paper status
|
6 years ago |
Anton Romanov
|
3bede5f561
|
fix papers delete
|
6 years ago |
Anton Romanov
|
b140a61a9b
|
fix papers crud
|
6 years ago |
Anton Romanov
|
7d286c0d76
|
fix paper controller
|
6 years ago |
Anton Romanov
|
d8fa601103
|
add file uploading
|
6 years ago |
Anton Romanov
|
4eaa7b3f59
|
add big logo
|
6 years ago |
Anton Romanov
|
896d23948f
|
add paper controller
|
6 years ago |