Семенова Мария
|
1e07c5424d
|
#109 only one conference for paper
|
2019-05-07 21:35:50 +04:00 |
|
Семенова Мария
|
dffd839905
|
#109 only uncompleted for grant
|
2019-05-07 20:26:49 +04:00 |
|
Васин Антон
|
279cc0e18a
|
#101 project model edited
|
2019-05-07 14:00:24 +03:00 |
|
Васин Антон
|
b1e101c940
|
#101 db event edited
|
2019-05-07 13:34:00 +03:00 |
|
T-Midnight
|
2dae39a100
|
#119 create grants notification service
|
2019-05-06 23:57:16 +04:00 |
|
Васин Антон
|
241c489b21
|
#98 deadline edited
|
2019-05-06 22:10:40 +03:00 |
|
Васин Антон
|
52ae197f34
|
Merge branch 'dev' into 98-project-tasks
|
2019-05-06 21:57:30 +03:00 |
|
Васин Антон
|
4025aa67ca
|
#98 project completion added
|
2019-05-06 21:51:58 +03:00 |
|
ASH
|
65dea9bce2
|
#79 adding task planer generation
|
2019-05-06 22:39:08 +04:00 |
|
Васин Антон
|
4bab980f62
|
#98 deadline model and service edited
|
2019-05-06 20:17:10 +03:00 |
|
Васин Антон
|
ee55e08fee
|
#98 project tasks deadline edited
|
2019-05-06 17:43:20 +03:00 |
|
Васин Антон
|
82ab40a608
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
2019-05-06 13:04:13 +03:00 |
|
Anton Romanov
|
2dff183662
|
Merge branch '32-timeline-grants' into 'dev'
Resolve "Создать страницу таймлайна дедлайнов"
Closes #32
See merge request romanov73/ng-tracker!83
|
2019-05-06 07:06:04 +00:00 |
|
T-Midnight
|
da382b659a
|
#32 add deadlines on timeline page
|
2019-05-06 00:32:28 +04:00 |
|
T-Midnight
|
114f6769ac
|
#32 create changelog
|
2019-05-05 23:54:02 +04:00 |
|
T-Midnight
|
beb334f2fa
|
#32 add variable "events"
|
2019-05-04 23:59:03 +04:00 |
|
Anton Romanov
|
68737b976f
|
Merge branch '117-filter-users' into 'dev'
Resolve "Фильтрация участников гранта по двум новым параметрам"
Closes #117
See merge request romanov73/ng-tracker!77
|
2019-05-03 05:58:19 +00:00 |
|
Anton Romanov
|
6eed8591b4
|
Merge branch '70-notification-conf' into 'dev'
Resolve "Оповещения о дедлайнах конференции"
Closes #70
See merge request romanov73/ng-tracker!76
|
2019-05-03 05:56:33 +00:00 |
|
T-Midnight
|
74d43dcd0d
|
#117 resolve last discussion
|
2019-05-02 22:49:58 +04:00 |
|
T-Midnight
|
0955388f27
|
#117 fix port
|
2019-05-02 22:00:53 +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 |
|
Nightblade73
|
6350e1c0d6
|
#70 add hashCode for deadline
|
2019-05-02 14:51:22 +04:00 |
|
Nightblade73
|
6820c617f3
|
#70 remove conflicts
|
2019-05-02 14:42:08 +04:00 |
|
Nightblade73
|
60bdd9d233
|
#70 fixes
|
2019-05-02 14:35:40 +04:00 |
|
T-Midnight
|
c8cfde67a9
|
Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants
|
2019-05-01 00:21:56 +04:00 |
|
Anton Romanov
|
a6f2177179
|
Merge branch '114-bug-projects-list' into 'dev'
Resolve "Bug: не отображается список проектов"
Closes #114
See merge request romanov73/ng-tracker!82
|
2019-04-30 20:12:51 +00:00 |
|
T-Midnight
|
1f6d15b74b
|
#38 create changelogs
|
2019-04-30 23:55:31 +04:00 |
|
T-Midnight
|
a69a257f09
|
#38 add styles
|
2019-04-30 23:43:47 +04:00 |
|
T-Midnight
|
6442a67ff1
|
#38 update view
|
2019-04-30 23:41:51 +04:00 |
|
T-Midnight
|
2ebd61016d
|
#38 add variable "files"
|
2019-04-30 23:40:40 +04:00 |
|
ASH
|
7ce8b20841
|
#79 fixing bug
|
2019-04-30 22:05:57 +04:00 |
|
Nightblade73
|
0e062f1337
|
#70 fast fix
|
2019-04-30 11:41:36 +04:00 |
|
Nightblade73
|
9edcf35338
|
#70 added ping notification
|
2019-04-30 10:43:36 +04:00 |
|
Васин Антон
|
5c677a975c
|
#114 changelog edited
|
2019-04-30 01:01:30 +03:00 |
|
Васин Антон
|
83f3f7d6b9
|
Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev
|
2019-04-30 00:32:02 +03:00 |
|
ASH
|
b4c11a7f90
|
#79 year generation
|
2019-04-28 23:58:35 +04:00 |
|
Nightblade73
|
0e8752e460
|
#70 style fixes
|
2019-04-27 20:34:49 +04:00 |
|
Nightblade73
|
e178cd1639
|
#70 added checking empty fields of deadline, fix bug on EventDto
|
2019-04-27 09:45:47 +04:00 |
|
T-Midnight
|
9cf002ad95
|
Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users
|
2019-04-26 15:22:04 +04:00 |
|
T-Midnight
|
39f3c69479
|
#117 add scopus papers filter
|
2019-04-26 15:16:04 +04:00 |
|
Nightblade73
|
dbcdb96dbf
|
#70 added event method, don't work, because trying to find null entity
|
2019-04-26 15:12:34 +04:00 |
|
Anton Romanov
|
a352f561fa
|
Merge branch '118-bug-create-paper-notification' into 'dev'
Resolve "Bug: не отправляется сообщение о создании новой статьи"
Closes #118
See merge request romanov73/ng-tracker!79
|
2019-04-26 07:57:36 +00:00 |
|
Васин Антон
|
b2d4d52675
|
Merge remote-tracking branch 'origin/dev' into dev
|
2019-04-26 10:01:21 +03:00 |
|
Семенова Мария
|
a8fbf98d85
|
#118 check if next deadline present
|
2019-04-26 10:37:50 +04:00 |
|
Anton Romanov
|
4d2d7fa113
|
fix lambda
|
2019-04-26 09:47:41 +04:00 |
|
Anton Romanov
|
9393fbe326
|
fix deprecated imports
|
2019-04-26 09:46:38 +04:00 |
|
Nightblade73
|
51877023d1
|
#70 added new column to event
|
2019-04-26 09:28:20 +04:00 |
|
Anton Romanov
|
1fe2f5469b
|
Merge branch '108-references-formatting' into 'dev'
Resolve "Форматирование списка литературы"
Closes #108
See merge request romanov73/ng-tracker!78
|
2019-04-26 04:24:09 +00:00 |
|