Commit Graph

51 Commits

Author SHA1 Message Date
T-Midnight
b640dea99a #119 create scheduler 2019-05-09 00:45:54 +04:00
T-Midnight
e3ad5ba510 Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants 2019-05-08 16:22:39 +04:00
Семенова Мария
dffd839905 #109 only uncompleted for grant 2019-05-07 20:26:49 +04:00
T-Midnight
2dae39a100 #119 create grants notification service 2019-05-06 23:57:16 +04:00
T-Midnight
da382b659a #32 add deadlines on timeline page 2019-05-06 00:32:28 +04:00
T-Midnight
beb334f2fa #32 add variable "events" 2019-05-04 23:59:03 +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
T-Midnight
7c5a0826c5 #116 add new variable 2019-04-25 13:24:36 +04:00
T-Midnight
8ced83ad2b #116 delete annotation 2019-04-25 13:23:36 +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
T-Midnight
1e6b3cba3a #42 delete blank lines, fix js, fix leaderId validation 2019-04-17 13:25:10 +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
4955e9a637 #4--2 merge with dev 2019-04-11 22:39:59 +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
51c755ac07 #42 method hasErrors didn't work, return to the previous state 2019-04-10 09:39:07 +04:00
T-Midnight
e2e10477ac #42 delete GrantStatusDto 2019-04-09 21:31:23 +04:00
Anton Romanov
e350f8b3c1 #55 refactor controller navigation, fix conference edit url 2019-04-08 07:40:26 +04:00
T-Midnight
566b7821d1 #42 merge dev into 42 2019-04-04 09:43:26 +04:00
T-Midnight
8a7117d713 #42 Add leader and authors 2019-04-04 09:38:18 +04:00
Anton Romanov
7b0b7a041a #80 hide mvc controllers from api 2019-03-28 14:45:39 +04:00
T-Midnight
29df7120bf Delete DeadlineDTO and update usages 2019-03-18 14:27:54 +04:00
T-Midnight
99d85a5648 Add new status for grant 2019-03-15 12:24:02 +04:00
T-Midnight
de96be2471 Create Navigation class to avoid "magic strings" and code duplication 2019-03-15 12:19:01 +04:00
Anton Romanov
4f47b1beb6 fix code 2019-03-04 10:28:46 +04:00
Anton Romanov
e2c12d9fb2 fix code 2019-03-04 10:24:30 +04:00
Anton Romanov
ebb036ee71 some refactor 2018-12-28 14:00:09 +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
T-Midnight
d7721ce19d Update classes 2018-12-24 15:20:57 +04:00
T-Midnight
a2fa574888 Create Controller&Service 2018-12-23 02:22:41 +04:00
T-Midnight
9e5f3d7247 Add constructor 2018-12-23 02:22:24 +04:00
T-Midnight
edd38beb67 Add function getNextDeadline() 2018-12-23 02:22:06 +04:00
T-Midnight
eff5344aea Create GrantRepository 2018-12-22 18:03:18 +04:00
T-Midnight
42d33d1be8 Create setters for GrantDto 2018-12-22 03:31:43 +04:00
Anton Romanov
d71a8d2c83 move classes, add deadline to entities, fix db changelogs 2018-12-11 15:08:35 +04:00