ng-tracker

romanov73/ng-tracker

Fork 0

Commit Graph

Select branches

Hide Pull Requests

1-audit-listener

100-project-documents

104-paper-unit-tests

44-check-complete-deadlines

48-crud

77-students-datetime-sorting

89-

90-edit-workload

93-activites-analytics

99-project-from-grant

dev

gl_87

gl_88

lk

master

#128

#129

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#240

#241

#242

#243

#244

#245

#246

#248

0.1.0

8b333ab3a6 Merge branch '38-attach-file-grants' into 117-filter-users T-Midnight 2019-05-02 21:29:20 +04:00
6350e1c0d6 #70 add hashCode for deadline #203 Nightblade73 2019-05-02 14:51:22 +04:00
6820c617f3 #70 remove conflicts Nightblade73 2019-05-02 14:42:08 +04:00
60bdd9d233 #70 fixes Nightblade73 2019-05-02 14:35:40 +04:00
c8cfde67a9 Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants #208 T-Midnight 2019-05-01 00:21:56 +04:00
a6f2177179 Merge branch '114-bug-projects-list' into 'dev' Anton Romanov 2019-04-30 20:12:51 +00:00
1f6d15b74b #38 create changelogs T-Midnight 2019-04-30 23:55:31 +04:00
a69a257f09 #38 add styles T-Midnight 2019-04-30 23:43:47 +04:00
6442a67ff1 #38 update view T-Midnight 2019-04-30 23:41:51 +04:00
2ebd61016d #38 add variable "files" T-Midnight 2019-04-30 23:40:40 +04:00
7ce8b20841 #79 fixing bug ASH 2019-04-30 22:05:57 +04:00
0e062f1337 #70 fast fix Nightblade73 2019-04-30 11:41:36 +04:00
9edcf35338 #70 added ping notification Nightblade73 2019-04-30 10:43:36 +04:00
5c677a975c #114 changelog edited #209 Васин Антон 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
b4c11a7f90 #79 year generation ASH 2019-04-28 23:58:35 +04:00
0e8752e460 #70 style fixes Nightblade73 2019-04-27 20:34:49 +04:00
e178cd1639 #70 added checking empty fields of deadline, fix bug on EventDto Nightblade73 2019-04-27 09:45:47 +04:00
9cf002ad95 Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users T-Midnight 2019-04-26 15:22:04 +04:00
39f3c69479 #117 add scopus papers filter T-Midnight 2019-04-26 15:16:04 +04:00
dbcdb96dbf #70 added event method, don't work, because trying to find null entity Nightblade73 2019-04-26 15:12:34 +04:00
a352f561fa Merge branch '118-bug-create-paper-notification' into 'dev' Anton Romanov 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 #206 Семенова Мария 2019-04-26 10:37:50 +04:00
4d2d7fa113 fix lambda Anton Romanov 2019-04-26 09:47:41 +04:00
9393fbe326 fix deprecated imports Anton Romanov 2019-04-26 09:46:38 +04:00
51877023d1 #70 added new column to event Nightblade73 2019-04-26 09:28:20 +04:00
1fe2f5469b Merge branch '108-references-formatting' into 'dev' Anton Romanov 2019-04-26 04:24:09 +00:00
51e121ae24 #117 add BAK papers filter T-Midnight 2019-04-26 00:29:20 +04:00
8f3e3fd9a7 #108 add formatting methods #205 Семенова Мария 2019-04-26 00:00:01 +04:00
71ec7bb726 #108 add reference dto Семенова Мария 2019-04-25 22:08:24 +04:00
34925b81ff #70 added schedule for deadline of conference Nightblade73 2019-04-25 21:17:48 +04:00
16e9bf1fb5 #70 added update notification for all participants Nightblade73 2019-04-25 19:15:19 +04:00
c489ebbf91 #70 added create notification for all users about new conference Nightblade73 2019-04-25 17:12:39 +04:00
88ec35faa0 Merge branch '68-ping-conf' into 'dev' Anton Romanov 2019-04-25 10:00:34 +00:00
fc94ea1f26 Merge branch '116-delete-deadline' into 'dev' Anton Romanov 2019-04-25 09:48:38 +00:00
7853496048 #116 add style for delete icon #202 T-Midnight 2019-04-25 13:26:40 +04:00
2bb5189fff #116 update view T-Midnight 2019-04-25 13:25:56 +04:00
4fa0c14ae6 #116 add removeDeadline method T-Midnight 2019-04-25 13:25:32 +04:00
7c5a0826c5 #116 add new variable T-Midnight 2019-04-25 13:24:36 +04:00
8ced83ad2b #116 delete annotation T-Midnight 2019-04-25 13:23:36 +04:00
bc73265109 Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf #196 Nightblade73 2019-04-24 22:41:48 +04:00
b77619777e #68 added dashboard-card styles depending on the conference.ping count Nightblade73 2019-04-24 22:34:56 +04:00
70d260c34b #68 ping but style Nightblade73 2019-04-24 21:52:13 +04:00
d4b514a9b0 #68 added ping in db Nightblade73 2019-04-24 21:24:32 +04:00
d921def09d #68 added ping method Nightblade73 2019-04-24 21:05:25 +04:00
f556b969b4 #68 added demo version of charts, using highcharts lib Nightblade73 2019-04-24 18:55:52 +04:00
b16b3ed2e3 #68 added class structure Nightblade73 2019-04-24 17:41:19 +04:00
5bff419dbd #68 added ping table Nightblade73 2019-04-24 16:44:17 +04:00
4dd0a6c210 fix merge bug Anton Romanov 2019-04-24 13:45:09 +04:00
bb2518e5f4 Merge branch '76-students-tags-filter' into 'dev' Anton Romanov 2019-04-24 09:36:03 +00:00
1e6fbdc1fa Merge branch '64-add-article-conf' into 'dev' Anton Romanov 2019-04-24 09:35:08 +00:00
54c6fe815d Merge branch '113-delete-project' into 'dev' Anton Romanov 2019-04-24 09:34:12 +00:00
d37c9bda57 #64 excluded adding articles with the same name #197 Nightblade73 2019-04-24 10:17:32 +04:00
fe55890518 #64 more style fixes Nightblade73 2019-04-24 10:12:42 +04:00
7eb5dce94e #64 style fixes Nightblade73 2019-04-24 09:42:00 +04:00
7248a84c30 #76 adding sorting #188 ASH 2019-04-24 01:03:56 +04:00
02d643727e #113 projects/projects edited #198 Васин Антон 2019-04-23 23:32:40 +03:00
50a0f8aa78 #113 projects.js added Васин Антон 2019-04-23 23:19:25 +03:00
2418e953be #113 line fragment edited Васин Антон 2019-04-23 23:15:52 +03:00
e32da7c7c2 #113 delete function Васин Антон 2019-04-23 23:11:45 +03:00
3aea19088d Merge branch '115-follow-up-from-resolve' into 'dev' Anton Romanov 2019-04-23 19:17:17 +00:00
8f2f6adc3b #64 show global message Anton Romanov 2019-04-23 23:15:22 +04:00
c18ecea13b #115 move method to service #200 T-Midnight 2019-04-23 22:03:06 +04:00
bf515a3fcb Merge remote-tracking branch 'remotes/origin/107-attach-article' into 115-follow-up-from-resolve T-Midnight 2019-04-23 21:47:54 +04:00
2d6de6b535 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-23 19:52:38 +03:00
39f44403c1 Merge branch '114-bug-projects-list' into 'dev' Anton Romanov 2019-04-23 12:14:22 +00:00
2f3c1addbb #114 unused imports removed #199 Васин Антон 2019-04-23 14:20:17 +03:00
c78ea05255 #114 update edited Васин Антон 2019-04-23 14:11:42 +03:00
26969dba5b #107 merge with dev #191 T-Midnight 2019-04-23 15:02:41 +04:00
6df1a87367 #107 merge with dev T-Midnight 2019-04-23 15:01:47 +04:00
546b0dc323 #107 add styles T-Midnight 2019-04-23 14:51:51 +04:00
41bd00d645 project dashboard edited Васин Антон 2019-04-23 13:40:11 +03:00
955bdaa438 fix repository method Anton Romanov 2019-04-23 13:55:59 +04:00
60dfad5d76 Merge branch 'dev' into move-to-jdk11 Anton Romanov 2019-04-23 13:51:21 +04:00
6d6ea3136d #64 dont show error message Nightblade73 2019-04-23 13:37:56 +04:00
70920cc612 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-23 12:33:56 +03:00
d3b8be2cf1 #107 add view of the selected papers T-Midnight 2019-04-23 13:21:13 +04:00
e16b1da761 fix script Anton Romanov 2019-04-23 12:46:17 +04:00
09cae66ca4 fix image Anton Romanov 2019-04-23 12:38:15 +04:00
7684bac74d Merge branch 'dev' into move-to-jdk11 Anton Romanov 2019-04-23 11:35:41 +04:00
5e86952cb6 Merge branch '97-edit-project' into 'dev' Anton Romanov 2019-04-23 07:34:13 +00:00
019fe7c652 #97 adding deadlines #186 Васин Антон 2019-04-23 10:32:23 +03:00
3698d31bc8 #76 fixing conflicts ASH 2019-04-22 21:52:26 +04:00
53cc777734 #64 delete conference refactor Nightblade73 2019-04-22 21:46:42 +04:00
53cc947a17 #97 copy from DTO edited Васин Антон 2019-04-22 15:48:29 +03:00
ba565746f5 #97 dashboard added Васин Антон 2019-04-22 14:41:58 +03:00
519dd51446 #97 dashboard added Васин Антон 2019-04-22 14:31:46 +03:00
349e7373ff #97 save function Васин Антон 2019-04-22 14:19:01 +03:00
2767403128 #64 added saving in db Nightblade73 2019-04-22 15:11:52 +04:00
5bfeaff054 #64 added method addPaper Nightblade73 2019-04-22 11:13:04 +04:00
b6ced3ce1a Merge branch '60-sort-conf' into 'dev' Anton Romanov 2019-04-22 03:12:00 +00:00
7fac92b52f Merge branch '110-paper-type' into 'dev' Anton Romanov 2019-04-22 03:10:48 +00:00
6876d09557 #76 adding style to filters ASH 2019-04-21 19:02:27 +04:00
ddd21dab1c #60 added dashboard #193 Nightblade73 2019-04-21 17:18:44 +04:00
8400c5d40d Merge remote-tracking branch 'remotes/origin/dev' into 76-students-tags-filter ASH 2019-04-21 15:47:56 +04:00
a4ae42f072 #60 added sorting Nightblade73 2019-04-21 15:03:31 +04:00
a3d1834ab8 #110 add paper type #194 Семенова Мария 2019-04-21 12:17:31 +04:00
bc98785be9 Merge branch '59-filter-conference' into 'dev' #195 77-students-datetime-sorting Anton Romanov 2019-04-19 14:46:23 +00:00
a9f4a326c5 #59 fixed styles #192 Nightblade73 2019-04-19 18:38:56 +04:00