Commit Graph

151 Commits

Author SHA1 Message Date
T-Midnight
4da039f9b0 Create dashboard for grants 2018-11-10 21:55:09 +04:00
Elena
2db572f284 Задача №10 2018-11-09 15:43:25 +04:00
Elena
0f9bbc13cc Merge branch 'master' into 10-savePaper 2018-11-09 13:43:08 +04:00
Elena
65d788512b Задача №10 2018-11-09 13:42:28 +04:00
Anton Romanov
cd09cf6d60 add toolbar 2018-11-08 21:58:10 +04:00
Anton Romanov
d721907c24 Merge branch 'master' into 4-show-time-line
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2018-10-30 23:29:18 +04:00
Anton Romanov
02499c0aae fix db 2018-10-30 23:26:55 +04:00
Anton Romanov
5e7cff8ac6 some fix 2018-10-25 10:27:57 +04:00
Alyona
75c33bb065 finish deadline 2018-10-25 08:53:48 +04:00
Alyona
4f49e7ae32 finish deadline 2018-10-25 08:53:29 +04:00
Alyona
92b807f6b9 Merge branch 'master' into 8-Deadline 2018-10-25 08:44:25 +04:00
Alyona
cd6b82f892 partially add deadline 2018-10-25 08:41:37 +04:00
Anton Romanov
275348563d use html5 datetime pickers 2018-10-18 11:21:26 +04:00
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
Elena
b1c98aba45 Задача №6 2018-10-10 23:09:45 +04: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
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
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
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
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