331 Commits

Author SHA1 Message Date
Anton Romanov
74d9c5cd20 show toolbar buttons 2018-11-14 17:04:29 +04:00
Anton Romanov
863991953c show paper status 2018-11-14 17:04:13 +04:00
Anton Romanov
06864c7ec8 read dashboard 2018-11-14 15:15:23 +04:00
Alyona
02f762b4f1 filter 2018-11-14 08:55:46 +04:00
Anton Romanov
600d58d416 Merge branch '20-' into 'master'
Resolve "Реализовать периодические события"

Closes #20

See merge request romanov73/ng-tracker!15
2018-11-10 21:44:36 +00:00
Anton Romanov
f0ac06c900 refactor and db changes 2018-11-11 01:29:06 +04:00
Anton Romanov
7cffbef9e2 delete paper 2018-11-10 23:15:35 +04:00
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
Anton Romanov
d5f9a81b46 remove styles from email template 2018-11-09 15:37:58 +04:00
Anton Romanov
6aa5f807b7 move styles to body 2018-11-09 15:21:03 +04:00
Anton Romanov
1b53debc88 Merge branch 'master' into 21-Event-status
# Conflicts:
#	src/main/resources/db/changelog-master.xml
2018-11-09 15:08:10 +04:00
Anton Romanov
5c54817fc6 fix styles 2018-11-09 15:05:39 +04:00
Anton Romanov
1211b0db29 add styles in email templates 2018-11-09 14:53:24 +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
67881262be add notification templates 2018-11-09 10:04:50 +04:00
Anton Romanov
cd09cf6d60 add toolbar 2018-11-08 21:58:10 +04:00
Anton Romanov
e554f9ea4c fix paths 2018-11-08 20:34:09 +04:00
Anton Romanov
4c43776528 add config parameter 2018-11-08 20:08:26 +04:00
Anton Romanov
bd78be93ab add paper create strategy 2018-11-08 19:36:50 +04:00
Alyona
8fe9f6625c changelog 2018-10-31 20:06:27 +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
128b147bf2 Revert "remove liquibase"
This reverts commit 43917c0
2018-10-30 23:07:01 +04:00
Anton Romanov
679756b02b Merge remote-tracking branch 'origin/4-show-time-line' into 4-show-time-line 2018-10-30 23:04:49 +04:00
Anton Romanov
4e7c0259d4 Revert "remove liquibase"
This reverts commit 43917c0
2018-10-30 23:04:21 +04:00
Anton Romanov
7388b2cb27 add database column 2018-10-27 23:16:14 +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
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
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