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

ff7f535980 Merge branch '119-notification-grants' into 'dev' Anton Romanov 2019-05-09 04:18:55 +0000
77e2ad0651 #119 add send notification functions #211 T-Midnight 2019-05-09 01:24:55 +0400
74a8dcbd8a #119 add leader changed notification T-Midnight 2019-05-09 01:23:17 +0400
4262446aef #119 create all mail templates T-Midnight 2019-05-09 01:21:56 +0400
51164ce11c fix enum dtos Anton Romanov 2019-05-09 00:47:28 +0400
b640dea99a #119 create scheduler T-Midnight 2019-05-09 00:45:54 +0400
2d9fd05060 #119 create grantCreateNotification mail template T-Midnight 2019-05-08 23:32:37 +0400
b57142e28f #70 added unique name control Nightblade73 2019-05-08 17:08:37 +0400
e3ad5ba510 Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants T-Midnight 2019-05-08 16:22:39 +0400
09aa3d0084 Merge branch '122-bug-leader-grants' into 'dev' Anton Romanov 2019-05-08 09:25:37 +0000
662847698e Merge branch '109-paper-attach-control' into 'dev' Anton Romanov 2019-05-08 09:10:03 +0000
2fba252df0 #109 show other paper attachs #214 Семенова Мария 2019-05-07 23:53:10 +0400
7ffe04f1db #122 move to right directory #215 T-Midnight 2019-05-07 22:47:27 +0400
d244437858 #122 fix bug T-Midnight 2019-05-07 22:35:44 +0400
934d194df1 #119 gelete unnecessary column T-Midnight 2019-05-07 22:15:49 +0400
1e07c5424d #109 only one conference for paper Семенова Мария 2019-05-07 21:35:50 +0400
dffd839905 #109 only uncompleted for grant Семенова Мария 2019-05-07 20:26:49 +0400
279cc0e18a #101 project model edited Васин Антон 2019-05-07 14:00:24 +0300
b1e101c940 #101 db event edited Васин Антон 2019-05-07 13:34:00 +0300
8449c028f9 partially paper view Anton Romanov 2019-05-07 09:34:16 +0400
2dae39a100 #119 create grants notification service T-Midnight 2019-05-06 23:57:16 +0400
241c489b21 #98 deadline edited Васин Антон 2019-05-06 22:10:40 +0300
52ae197f34 Merge branch 'dev' into 98-project-tasks Васин Антон 2019-05-06 21:57:30 +0300
4025aa67ca #98 project completion added Васин Антон 2019-05-06 21:51:58 +0300
65dea9bce2 #79 adding task planer generation ASH 2019-05-06 22:39:08 +0400
4bab980f62 #98 deadline model and service edited Васин Антон 2019-05-06 20:17:10 +0300
ee55e08fee #98 project tasks deadline edited Васин Антон 2019-05-06 17:43:20 +0300
7c1b87c126 fix paper list Anton Romanov 2019-05-06 15:05:28 +0400
7695e93cb7 fix logo url Anton Romanov 2019-05-06 14:20:19 +0400
8906214f52 fix dashboard Anton Romanov 2019-05-06 14:06:51 +0400
82ab40a608 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-05-06 13:04:13 +0300
2dff183662 Merge branch '32-timeline-grants' into 'dev' Anton Romanov 2019-05-06 07:06:04 +0000
09aa0bd4d6 Merge remote-tracking branch 'origin/move-to-jdk11' into lk arefiev1997 2019-05-06 00:38:58 +0400
da382b659a #32 add deadlines on timeline page #210 T-Midnight 2019-05-06 00:32:28 +0400
114f6769ac #32 create changelog T-Midnight 2019-05-05 23:54:02 +0400
beb334f2fa #32 add variable "events" T-Midnight 2019-05-04 23:59:03 +0400
a53a12fa55 Merge remote-tracking branch 'origin/move-to-jdk11' into gl_87 gl_87 arefiev1997 2019-05-04 12:08:42 +0400
68737b976f Merge branch '117-filter-users' into 'dev' Anton Romanov 2019-05-03 05:58:19 +0000
6eed8591b4 Merge branch '70-notification-conf' into 'dev' Anton Romanov 2019-05-03 05:56:33 +0000
4d7777831f Merge remote-tracking branch 'origin/try-vue' into try-vue Anton Romanov 2019-05-02 23:15:07 +0400
e3b6c02f56 #partilly add paper dashboard Anton Romanov 2019-05-02 23:06:57 +0400
74d43dcd0d #117 resolve last discussion #204 T-Midnight 2019-05-02 22:49:58 +0400
0955388f27 #117 fix port T-Midnight 2019-05-02 22:00:53 +0400
de625923e9 #117 resolve discussions v.2 T-Midnight 2019-05-02 21:56:54 +0400
b334b5d70e #117 resolve discussions T-Midnight 2019-05-02 21:42:06 +0400
8b333ab3a6 Merge branch '38-attach-file-grants' into 117-filter-users T-Midnight 2019-05-02 21:29:20 +0400
6350e1c0d6 #70 add hashCode for deadline #203 Nightblade73 2019-05-02 14:51:22 +0400
6820c617f3 #70 remove conflicts Nightblade73 2019-05-02 14:42:08 +0400
60bdd9d233 #70 fixes Nightblade73 2019-05-02 14:35:40 +0400
c8cfde67a9 Merge remote-tracking branch 'remotes/origin/dev' into 38-attach-file-grants #208 T-Midnight 2019-05-01 00:21:56 +0400
a6f2177179 Merge branch '114-bug-projects-list' into 'dev' Anton Romanov 2019-04-30 20:12:51 +0000
1f6d15b74b #38 create changelogs T-Midnight 2019-04-30 23:55:31 +0400
a69a257f09 #38 add styles T-Midnight 2019-04-30 23:43:47 +0400
6442a67ff1 #38 update view T-Midnight 2019-04-30 23:41:51 +0400
2ebd61016d #38 add variable "files" T-Midnight 2019-04-30 23:40:40 +0400
0c81689fd3 align authors line Anton Romanov 2019-04-30 22:12:16 +0400
7ce8b20841 #79 fixing bug ASH 2019-04-30 22:05:57 +0400
0d5f15614e #add paper navigation Anton Romanov 2019-04-30 19:12:32 +0400
181b14d2e7 #fix paper status Anton Romanov 2019-04-30 19:04:37 +0400
9c5c107c58 #fix controllers Anton Romanov 2019-04-30 17:54:07 +0400
a4cbb3e3df #show paper list Anton Romanov 2019-04-30 17:36:25 +0400
0e062f1337 #70 fast fix Nightblade73 2019-04-30 11:41:36 +0400
9edcf35338 #70 added ping notification Nightblade73 2019-04-30 10:43:36 +0400
5c677a975c #114 changelog edited #209 Васин Антон 2019-04-30 01:01:30 +0300
83f3f7d6b9 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-04-30 00:32:02 +0300
b4c11a7f90 #79 year generation ASH 2019-04-28 23:58:35 +0400
0e8752e460 #70 style fixes Nightblade73 2019-04-27 20:34:49 +0400
e178cd1639 #70 added checking empty fields of deadline, fix bug on EventDto Nightblade73 2019-04-27 09:45:47 +0400
9cf002ad95 Merge remote-tracking branch 'remotes/origin/dev' into 117-filter-users T-Midnight 2019-04-26 15:22:04 +0400
39f3c69479 #117 add scopus papers filter T-Midnight 2019-04-26 15:16:04 +0400
dbcdb96dbf #70 added event method, don't work, because trying to find null entity Nightblade73 2019-04-26 15:12:34 +0400
ac88ef2704 add dependencies, fix html Anton Romanov 2019-04-26 14:42:44 +0400
ae102d6466 #fix styles Anton Romanov 2019-04-26 13:37:24 +0400
a7ceebb7c5 #first try to show index page Anton Romanov 2019-04-26 13:02:59 +0400
a352f561fa Merge branch '118-bug-create-paper-notification' into 'dev' Anton Romanov 2019-04-26 07:57:36 +0000
b2d4d52675 Merge remote-tracking branch 'origin/dev' into dev Васин Антон 2019-04-26 10:01:21 +0300
a8fbf98d85 #118 check if next deadline present #206 Семенова Мария 2019-04-26 10:37:50 +0400
4d2d7fa113 fix lambda Anton Romanov 2019-04-26 09:47:41 +0400
9393fbe326 fix deprecated imports Anton Romanov 2019-04-26 09:46:38 +0400
51877023d1 #70 added new column to event Nightblade73 2019-04-26 09:28:20 +0400
1fe2f5469b Merge branch '108-references-formatting' into 'dev' Anton Romanov 2019-04-26 04:24:09 +0000
51e121ae24 #117 add BAK papers filter T-Midnight 2019-04-26 00:29:20 +0400
8f3e3fd9a7 #108 add formatting methods #205 Семенова Мария 2019-04-26 00:00:01 +0400
71ec7bb726 #108 add reference dto Семенова Мария 2019-04-25 22:08:24 +0400
34925b81ff #70 added schedule for deadline of conference Nightblade73 2019-04-25 21:17:48 +0400
16e9bf1fb5 #70 added update notification for all participants Nightblade73 2019-04-25 19:15:19 +0400
c489ebbf91 #70 added create notification for all users about new conference Nightblade73 2019-04-25 17:12:39 +0400
88ec35faa0 Merge branch '68-ping-conf' into 'dev' Anton Romanov 2019-04-25 10:00:34 +0000
fc94ea1f26 Merge branch '116-delete-deadline' into 'dev' Anton Romanov 2019-04-25 09:48:38 +0000
7853496048 #116 add style for delete icon #202 T-Midnight 2019-04-25 13:26:40 +0400
2bb5189fff #116 update view T-Midnight 2019-04-25 13:25:56 +0400
4fa0c14ae6 #116 add removeDeadline method T-Midnight 2019-04-25 13:25:32 +0400
7c5a0826c5 #116 add new variable T-Midnight 2019-04-25 13:24:36 +0400
8ced83ad2b #116 delete annotation T-Midnight 2019-04-25 13:23:36 +0400
bc73265109 Merge remote-tracking branch 'remotes/origin/dev' into 68-ping-conf #196 Nightblade73 2019-04-24 22:41:48 +0400
b77619777e #68 added dashboard-card styles depending on the conference.ping count Nightblade73 2019-04-24 22:34:56 +0400
70d260c34b #68 ping but style Nightblade73 2019-04-24 21:52:13 +0400
d4b514a9b0 #68 added ping in db Nightblade73 2019-04-24 21:24:32 +0400
d921def09d #68 added ping method Nightblade73 2019-04-24 21:05:25 +0400
f556b969b4 #68 added demo version of charts, using highcharts lib Nightblade73 2019-04-24 18:55:52 +0400