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 |
|
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 |
|
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
|
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
|
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 |
|
|
885c553153
|
delete orphaned files, migrate to webjars, some fixes and refactoring
|
2018-05-20 08:05:21 +02:00 |
|
Anton Romanov
|
2fda487555
|
add paper authors
|
2018-05-05 14:49:34 +04:00 |
|
Anton Romanov
|
e465651eb2
|
add paper status
|
2018-05-05 11:17:13 +04:00 |
|
Anton Romanov
|
3bede5f561
|
fix papers delete
|
2018-05-05 11:14:37 +04:00 |
|
Anton Romanov
|
b140a61a9b
|
fix papers crud
|
2018-05-05 10:57:02 +04:00 |
|
Anton Romanov
|
7d286c0d76
|
fix paper controller
|
2018-05-05 00:39:18 +04:00 |
|
Anton Romanov
|
d8fa601103
|
add file uploading
|
2018-05-05 00:24:48 +04:00 |
|
Anton Romanov
|
4eaa7b3f59
|
add big logo
|
2018-05-04 18:09:29 +04:00 |
|
Anton Romanov
|
896d23948f
|
add paper controller
|
2018-05-04 18:04:09 +04:00 |
|
Anton Romanov
|
0a2a8c503c
|
add ci
|
2018-05-04 17:54:46 +04:00 |
|
Anton Romanov
|
fa94b60cef
|
gitignore
|
2018-05-04 17:23:22 +04:00 |
|
Anton Romanov
|
671cfdd486
|
add java code
|
2018-05-04 17:08:20 +04:00 |
|
Anton Romanov
|
6d84626599
|
add works
|
2018-04-30 00:47:50 +04:00 |
|
Anton Romanov
|
9142f03a0c
|
add paper page
|
2018-04-29 20:48:05 +04:00 |
|
Anton Romanov
|
df1793dc91
|
add paper page
|
2018-04-29 20:46:54 +04:00 |
|
Anton Romanov
|
c64264378d
|
add paper page
|
2018-04-29 20:44:47 +04:00 |
|
Anton Romanov
|
258c7f1943
|
add papers page
|
2018-04-29 18:24:42 +04:00 |
|
Anton Romanov
|
acaa8ed66a
|
fix menu and sources
|
2018-04-29 17:09:58 +04:00 |
|
Anton Romanov
|
5692102c83
|
fix title page
|
2018-04-29 00:49:37 +04:00 |
|
Anton Romanov
|
29fd19b218
|
fix title page
|
2018-04-28 23:30:38 +04:00 |
|
Anton Romanov
|
9e4e3834d2
|
copy from landing
|
2018-04-28 22:50:26 +04:00 |
|