Васин Антон
|
4025aa67ca
|
#98 project completion added
|
2019-05-06 21:51:58 +03: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Семенова Мария
|
a8fbf98d85
|
#118 check if next deadline present
|
2019-04-26 10:37:50 +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
|
7853496048
|
#116 add style for delete icon
|
2019-04-25 13:26:40 +04:00 |
|
T-Midnight
|
2bb5189fff
|
#116 update view
|
2019-04-25 13:25:56 +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 |
|
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
|
b77619777e
|
#68 added dashboard-card styles depending on the conference.ping count
|
2019-04-24 22:34:56 +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 |
|
Nightblade73
|
5bff419dbd
|
#68 added ping table
|
2019-04-24 16:44:17 +04:00 |
|