Nightblade73
|
a8d987b01f
|
#104 test copy from dto method
|
2019-05-14 17:49:22 +04:00 |
|
Nightblade73
|
9da5fd8a7a
|
#104 shock, the first unit test works
|
2019-05-14 00:02:30 +04:00 |
|
T-Midnight
|
77e2ad0651
|
#119 add send notification functions
|
2019-05-09 01:24:55 +04:00 |
|
T-Midnight
|
74a8dcbd8a
|
#119 add leader changed notification
|
2019-05-09 01:23:17 +04:00 |
|
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 |
|
Семенова Мария
|
2fba252df0
|
#109 show other paper attachs
|
2019-05-07 23:53:10 +04:00 |
|
Семенова Мария
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
2ebd61016d
|
#38 add variable "files"
|
2019-04-30 23:40:40 +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 |
|
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 |
|
Nightblade73
|
51877023d1
|
#70 added new column to event
|
2019-04-26 09:28:20 +04:00 |
|
T-Midnight
|
51e121ae24
|
#117 add BAK papers filter
|
2019-04-26 00:29:20 +04:00 |
|
Семенова Мария
|
8f3e3fd9a7
|
#108 add formatting methods
|
2019-04-26 00:00:01 +04:00 |
|
Семенова Мария
|
71ec7bb726
|
#108 add reference dto
|
2019-04-25 22:08:24 +04:00 |
|
Nightblade73
|
34925b81ff
|
#70 added schedule for deadline of conference
|
2019-04-25 21:17:48 +04:00 |
|
Nightblade73
|
16e9bf1fb5
|
#70 added update notification for all participants
|
2019-04-25 19:15:19 +04:00 |
|
Nightblade73
|
c489ebbf91
|
#70 added create notification for all users about new conference
|
2019-04-25 17:12:39 +04:00 |
|
Anton Romanov
|
88ec35faa0
|
Merge branch '68-ping-conf' into 'dev'
Resolve "Ping конференции в списке конференций"
Closes #68
See merge request romanov73/ng-tracker!69
|
2019-04-25 10:00:34 +00: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 |
|
Nightblade73
|
bc73265109
|
Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf
# Conflicts:
# src/main/java/ru/ulstu/conference/repository/ConferenceRepository.java
# src/main/java/ru/ulstu/conference/service/ConferenceService.java
# src/main/resources/db/changelog-master.xml
|
2019-04-24 22:41:48 +04:00 |
|
Nightblade73
|
70d260c34b
|
#68 ping but style
|
2019-04-24 21:52:13 +04:00 |
|
Nightblade73
|
d4b514a9b0
|
#68 added ping in db
|
2019-04-24 21:24:32 +04:00 |
|
Nightblade73
|
d921def09d
|
#68 added ping method
|
2019-04-24 21:05:25 +04:00 |
|
Nightblade73
|
f556b969b4
|
#68 added demo version of charts, using highcharts lib
|
2019-04-24 18:55:52 +04:00 |
|
Nightblade73
|
b16b3ed2e3
|
#68 added class structure
|
2019-04-24 17:41:19 +04:00 |
|
Anton Romanov
|
4dd0a6c210
|
fix merge bug
|
2019-04-24 13:45:09 +04:00 |
|
Anton Romanov
|
bb2518e5f4
|
Merge branch '76-students-tags-filter' into 'dev'
Resolve "Фильтр задач по типу (тегам)"
Closes #77, #75, and #76
See merge request romanov73/ng-tracker!61
|
2019-04-24 09:36:03 +00:00 |
|
Anton Romanov
|
1e6fbdc1fa
|
Merge branch '64-add-article-conf' into 'dev'
Resolve "Добавить новую статью к конференции"
Closes #64
See merge request romanov73/ng-tracker!70
|
2019-04-24 09:35:08 +00:00 |
|
Anton Romanov
|
54c6fe815d
|
Merge branch '113-delete-project' into 'dev'
Resolve "Реализовать удаление проекта"
Closes #113
See merge request romanov73/ng-tracker!71
|
2019-04-24 09:34:12 +00:00 |
|
Nightblade73
|
d37c9bda57
|
#64 excluded adding articles with the same name
|
2019-04-24 10:17:32 +04:00 |
|