Commit Graph

168 Commits

Author SHA1 Message Date
Alyona
5b16ac785c Merge branch 'master' into 23-dashboard
# Conflicts:
#	src/main/resources/templates/papers.html
2018-09-26 16:41:33 +04: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
Alyona
a93a19bcfe Alyona-Test 2018-09-25 17:13:01 +04:00
Elena
5c0e06e6b5 Тестовое задание 2018-09-25 16:45:01 +04: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
09e8618bb3 add timeline page 2018-09-05 21:58:04 +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
885c553153 delete orphaned files, migrate to webjars, some fixes and refactoring 2018-05-20 08:05:21 +02:00
Anton Romanov
b140a61a9b fix papers crud 2018-05-05 10:57:02 +04:00
Anton Romanov
0a2a8c503c add ci 2018-05-04 17:54:46 +04:00
Anton Romanov
671cfdd486 add java code 2018-05-04 17:08:20 +04:00