Elena
|
29f836fcc8
|
Задача №7
|
2018-10-18 10:38:04 +04:00 |
|
Anton Romanov
|
f9c977177a
|
Merge branch '6-authors-list-Matveeva' into 'master'
Resolve "Список авторов для статьи"
Closes #6
See merge request romanov73/ng-tracker!9
|
2018-10-18 04:49:10 +00:00 |
|
Anton Romanov
|
76666912d7
|
fix buttons size
|
2018-10-11 19:49:16 +04:00 |
|
Anton Romanov
|
47e906fddc
|
fix styles
|
2018-10-11 15:39:57 +04:00 |
|
Anton Romanov
|
e163529d66
|
load paper statuses
|
2018-10-11 10:03:44 +04:00 |
|
Anton Romanov
|
2464915b62
|
fix progress background
|
2018-10-11 09:05:41 +04:00 |
|
Elena
|
b1c98aba45
|
Задача №6
|
2018-10-10 23:09:45 +04:00 |
|
Anton Romanov
|
89f4b04a3f
|
Merge branch '5-' into 'master'
Resolve "Верстка страницы статьи"
Closes #5
See merge request romanov73/ng-tracker!5
|
2018-10-10 13:18:24 +00:00 |
|
Anton Romanov
|
0219b0ce28
|
fix paper view
|
2018-10-10 17:05:54 +04:00 |
|
Elena
|
31c7c8571e
|
Задача №5 new
|
2018-10-10 15:30:47 +04:00 |
|
Elena
|
95e366ca20
|
Merge branch 'master' into 5-Matveeva-Page
# Conflicts:
# src/main/resources/templates/paper.html
# src/main/resources/templates/papers.html
|
2018-10-10 10:09:07 +04:00 |
|
Elena
|
f9f287c190
|
Задача №5
|
2018-10-04 10:39:27 +04:00 |
|
Anton Romanov
|
2a493205f3
|
Merge branch '27-file-upload' into 'master'
Resolve "Пример для загрузки файлов"
Closes #27
See merge request romanov73/ng-tracker!7
|
2018-10-02 07:46:40 +00:00 |
|
Anton Romanov
|
7db839aee9
|
Merge branch 'master' into 27-file-upload
|
2018-10-02 11:11:13 +04:00 |
|
Anton Romanov
|
bf73be3b70
|
add messages
|
2018-10-02 10:58:41 +04:00 |
|
Anton Romanov
|
dd5ab38c40
|
add example for file uploading
|
2018-10-01 13:54:11 +04:00 |
|
Anton Romanov
|
a9f4e51558
|
minimize scripts
|
2018-09-29 09:22:48 +04:00 |
|
Anton Romanov
|
4009a5cf2b
|
fix error pages
|
2018-09-27 21:32:16 +04:00 |
|
Anton Romanov
|
f7bb4a2c74
|
Merge branch 'refactor-ui' into 'master'
Refactor ui
See merge request romanov73/ng-tracker!6
|
2018-09-27 16:01:02 +00:00 |
|
Anton Romanov
|
a3668ddcd3
|
move pages
|
2018-09-27 12:11:25 +04:00 |
|
Anton Romanov
|
550cc4cdf3
|
some refactor
|
2018-09-27 10:35:22 +04:00 |
|
Anton Romanov
|
7c8fa2b42a
|
Merge branch '3-ui' into 'master'
Resolve "Интерфейс"
Closes #3
See merge request romanov73/ng-tracker!1
|
2018-09-27 06:08:53 +00:00 |
|
Anton Romanov
|
879f388e66
|
Merge branch 'master' into 3-ui
# Conflicts:
# src/main/resources/templates/index.html
# src/main/resources/templates/papers.html
|
2018-09-27 10:03:00 +04:00 |
|
Anton Romanov
|
948305e4d9
|
Merge branch 'master' into 3-ui
# Conflicts:
# src/main/resources/templates/index.html
# src/main/resources/templates/papers.html
|
2018-09-27 10:02:49 +04:00 |
|
Alyona
|
fae5666694
|
Merge branch 'master' into 5-Page-of-paper
# Conflicts:
# src/main/resources/templates/papers.html
|
2018-09-26 16:44:36 +04:00 |
|
Alyona
|
5b16ac785c
|
Merge branch 'master' into 23-dashboard
# Conflicts:
# src/main/resources/templates/papers.html
|
2018-09-26 16:41:33 +04:00 |
|
Anton Romanov
|
f00a156c45
|
Merge branch '23-dashboard' into 'master'
Resolve "Создать страницу для dashboard статей"
Closes #23
See merge request romanov73/ng-tracker!4
|
2018-09-26 12:22:38 +00:00 |
|
Alyona
|
0814081187
|
Merge branch 'master' into 23-dashboard
# Conflicts:
# src/main/resources/templates/papers.html
|
2018-09-26 16:11:43 +04:00 |
|
Alyona
|
e4e37454ed
|
Merge branch 'master' into 23-dashboard
# Conflicts:
# src/main/resources/templates/papers.html
|
2018-09-26 16:11:19 +04:00 |
|
Alyona
|
48d3b57503
|
add paper page
|
2018-09-26 16:04:31 +04:00 |
|
Anton Romanov
|
5f4e63b96f
|
Merge branch '24-paper-page' into 'master'
Resolve "Создать страницу для редактирования/просмотра статьи"
Closes #24
See merge request romanov73/ng-tracker!3
|
2018-09-26 11:55:20 +00:00 |
|
Alyona
|
a93a19bcfe
|
Alyona-Test
|
2018-09-25 17:13:01 +04:00 |
|
Elena
|
5c0e06e6b5
|
Тестовое задание
|
2018-09-25 16:45:01 +04:00 |
|
Anton Romanov
|
88f42e90b5
|
Update README.md
|
2018-09-22 06:56:33 +00:00 |
|
Anton Romanov
|
1af2f9645a
|
change ports
|
2018-09-08 10:19:21 +04:00 |
|
Anton Romanov
|
d42c6ece7e
|
Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line
|
2018-09-08 10:07:21 +04:00 |
|
Anton Romanov
|
0ce90e2780
|
Merge branch 'master' into 4-show-time-line
|
2018-09-08 09:54:14 +04:00 |
|
Anton Romanov
|
3688423602
|
path to timeline
|
2018-09-08 09:53:34 +04:00 |
|
Anton Romanov
|
1259b6ff2b
|
fix papers font
|
2018-09-08 09:50:13 +04:00 |
|
Anton Romanov
|
b93f7e3f85
|
Update README.md
|
2018-09-06 19:14:04 +00:00 |
|
Anton Romanov
|
818c418565
|
add variable
|
2018-09-06 23:01:39 +04:00 |
|
Anton Romanov
|
cbcc006b13
|
deploy on vps
|
2018-09-06 22:50:34 +04:00 |
|
Anton Romanov
|
09e8618bb3
|
add timeline page
|
2018-09-05 21:58:04 +04:00 |
|
Anton Romanov
|
e9d81fef48
|
sort papers
|
2018-09-05 14:50:49 +04:00 |
|
Anton Romanov
|
294ed1838a
|
fix paper colors
|
2018-09-05 13:45:20 +04:00 |
|
Anton Romanov
|
5e4f137dba
|
add method for create paper
|
2018-09-05 13:31:51 +04:00 |
|
Anton Romanov
|
43e446e871
|
get paper list
|
2018-09-05 11:27:22 +04:00 |
|
Anton Romanov
|
1d74a7cab9
|
add timeline page
|
2018-06-10 13:43:40 +04:00 |
|
Anton Romanov
|
e27e56aa9b
|
fix time
|
2018-06-10 01:53:32 +04:00 |
|
Anton Romanov
|
da1fbc3124
|
send notification
|
2018-06-10 01:49:38 +04:00 |
|