35 Commits

Author SHA1 Message Date
a.vasin
267bd5b0f3 #101 event service edited 2019-06-01 11:44:41 +04:00
a.vasin
a5ac2bcbc2 Merge branch 'dev' of gitlab.com:romanov73/ng-tracker into 101-projecgt-timeline 2019-06-01 09:44:46 +04:00
Anton Romanov
b4b7b9087e fix npe 2019-05-31 08:12:57 +04:00
a.vasin
9013d79228 #101 grant attach 2019-05-29 23:40:30 +04:00
Anton Romanov
336a16ff73 some refactor 2019-05-27 09:14:24 +04:00
Anton Romanov
c303d65c8d #120 move to services 2019-05-23 16:02:44 +04:00
T-Midnight
5f214620bf #120 use loading from kias 2019-05-22 15:16:20 +04:00
T-Midnight
bb9f412480 #120 check unique grant name 2019-05-20 20:49:03 +04:00
T-Midnight
99ec7af319 #121 reduce paper title 2019-05-12 15:30:09 +04:00
T-Midnight
77e2ad0651 #119 add send notification functions 2019-05-09 01:24:55 +04:00
Семенова Мария
dffd839905 #109 only uncompleted for grant 2019-05-07 20:26:49 +04:00
T-Midnight
da382b659a #32 add deadlines on timeline page 2019-05-06 00:32:28 +04:00
T-Midnight
74d43dcd0d #117 resolve last discussion 2019-05-02 22:49:58 +04:00
T-Midnight
de625923e9 #117 resolve discussions v.2 2019-05-02 21:56:54 +04:00
T-Midnight
b334b5d70e #117 resolve discussions 2019-05-02 21:42:06 +04:00
T-Midnight
8b333ab3a6 Merge branch '38-attach-file-grants' into 117-filter-users 2019-05-02 21:29:20 +04:00
T-Midnight
2ebd61016d #38 add variable "files" 2019-04-30 23:40:40 +04:00
T-Midnight
39f3c69479 #117 add scopus papers filter 2019-04-26 15:16:04 +04:00
T-Midnight
51e121ae24 #117 add BAK papers filter 2019-04-26 00:29:20 +04:00
T-Midnight
4fa0c14ae6 #116 add removeDeadline method 2019-04-25 13:25:32 +04:00
Anton Romanov
4dd0a6c210 fix merge bug 2019-04-24 13:45:09 +04:00
T-Midnight
c18ecea13b #115 move method to service 2019-04-23 22:03:06 +04:00
T-Midnight
6df1a87367 #107 merge with dev 2019-04-23 15:01:47 +04:00
T-Midnight
d3b8be2cf1 #107 add view of the selected papers 2019-04-23 13:21:13 +04:00
Васин Антон
53cc947a17 #97 copy from DTO edited 2019-04-22 15:48:29 +03:00
T-Midnight
eec739a49f #41 create simple attach of articles 2019-04-19 17:49:36 +04:00
T-Midnight
e284298200 #42 rename variables 2019-04-18 13:09:50 +04:00
Anton Romanov
8b2a559d37 #42 fix thymeleaf expressions 2019-04-13 23:56:24 +04:00
T-Midnight
1756f29505 #42 filter authors by leader and degree 2019-04-13 12:39:53 +04:00
Anton Romanov
cafb3abcee #4--2 merge with dev 2019-04-11 22:37:32 +04:00
T-Midnight
bd3513118c #42 this don't work 2019-04-11 21:42:28 +04:00
T-Midnight
8a7117d713 #42 Add leader and authors 2019-04-04 09:38:18 +04:00
Anton Romanov
4f47b1beb6 fix code 2019-03-04 10:28:46 +04:00
Anton Romanov
ce78f8ad66 some refactor 2018-12-28 13:57:20 +04:00
T-Midnight
bcc64cda96 Create model folder for grant 2018-12-25 12:50:14 +04:00