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

Mono Color

• cec13bb677 some layout fix Anton Romanov 2018-12-30 19:23:11 +0400
• edc9c7c090 sort deadlines Anton Romanov 2018-12-30 19:22:51 +0400
• 2cac98be50 fix enum field name Anton Romanov 2018-12-29 09:58:37 +0400
• 7a490ef7a5 Merge branch '35-' into 'master' Anton Romanov 2018-12-28 10:04:42 +0000
• ebb036ee71 some refactor #151 Anton Romanov 2018-12-28 14:00:09 +0400
• ce78f8ad66 some refactor Anton Romanov 2018-12-28 13:57:20 +0400
• bcc64cda96 Create model folder for grant T-Midnight 2018-12-25 12:50:14 +0400
• 816d115cc8 Hide button "Add Project" when project already exists (not perfect) T-Midnight 2018-12-25 02:44:50 +0400
• 18ad291e82 Made button "delete grant" visible T-Midnight 2018-12-25 00:14:38 +0400
• fcbd91760d Rename table grant to grants T-Midnight 2018-12-24 23:39:19 +0400
• d7721ce19d Update classes T-Midnight 2018-12-24 15:20:57 +0400
• 2f68339ba2 Add thymeleaf template T-Midnight 2018-12-24 15:18:52 +0400
• 410d0d9634 Create service&repository for Project T-Midnight 2018-12-24 13:05:37 +0400
• 307b640e8e Create js for grants T-Midnight 2018-12-24 11:07:02 +0400
• 25278bcdd8 Create html fragments T-Midnight 2018-12-24 11:03:03 +0400
• a2fa574888 Create Controller&Service T-Midnight 2018-12-23 02:22:41 +0400
• c2a32d6c27 Update ProjectDto T-Midnight 2018-12-23 02:22:31 +0400
• 9e5f3d7247 Add constructor T-Midnight 2018-12-23 02:22:24 +0400
• edd38beb67 Add function getNextDeadline() T-Midnight 2018-12-23 02:22:06 +0400
• eff5344aea Create GrantRepository T-Midnight 2018-12-22 18:03:18 +0400
• 42d33d1be8 Create setters for GrantDto T-Midnight 2018-12-22 03:31:43 +0400
• 469a3ad07d fix display paper title Anton Romanov 2018-12-21 00:07:26 +0400
• 6e14860c34 fix paper status template Anton Romanov 2018-12-20 23:30:25 +0400
• 823f7a7743 try to fix template resolvers, step 4 Anton Romanov 2018-12-19 01:29:54 +0400
• 5a9ccbcfc1 try to fix template resolvers, step 3 Anton Romanov 2018-12-19 01:00:08 +0400
• e8bad4e24e try to fix template resolvers, step 2 Anton Romanov 2018-12-19 00:44:12 +0400
• 7089bd6c42 try to fix template resolvers Anton Romanov 2018-12-19 00:22:36 +0400
• 9ec7b42972 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-12-19 00:11:39 +0400
• 486a0ac50a try to fix gradlew Anton Romanov 2018-12-19 00:09:07 +0400
• fbaaac3a91 sort filtered papers Anton Romanov 2018-12-18 23:02:48 +0400
• 7dc34e1a82 Merge branch '47-statuses' into 'master' Anton Romanov 2018-12-18 18:45:43 +0000
• fa1c4a9c1c add statuses #150 Anton Romanov 2018-12-18 22:42:34 +0400
• 503f7f68bc Merge branch '46-mvc' into 'master' Anton Romanov 2018-12-18 18:18:25 +0000
• 468f440d9d fix filer #149 Anton Romanov 2018-12-18 22:15:21 +0400
• ec1e3ff052 fix scripts Anton Romanov 2018-12-18 19:40:23 +0400
• dc5abe1508 show authors Anton Romanov 2018-12-18 19:23:15 +0400
• c88ce3ac37 confirm delete paper Anton Romanov 2018-12-18 18:47:15 +0400
• c2c420027b add papers navigation Anton Romanov 2018-12-18 18:05:30 +0400
• 3e8b74f362 fix submit form Anton Romanov 2018-12-17 17:56:48 +0400
• d5121c895e fix email notification Anton Romanov 2018-12-17 17:29:06 +0400
• 05296bb26e fix route Anton Romanov 2018-12-17 17:28:52 +0400
• 59e2c9b544 edit deadlines Anton Romanov 2018-12-17 13:46:08 +0400
• 54ea705890 Merge branch 'master' into 46-mvc Anton Romanov 2018-12-14 16:00:46 +0400
• ac569ed9a9 Merge branch 'master' into 46-mvc Anton Romanov 2018-12-14 16:00:33 +0400
• 932cb71e71 Merge branch '36-' into 'master' Anton Romanov 2018-12-11 11:14:21 +0000
• d71a8d2c83 move classes, add deadline to entities, fix db changelogs #148 Anton Romanov 2018-12-11 15:08:35 +0400
• 590cd16abe Create model for grant, deadline and project T-Midnight 2018-12-08 23:53:38 +0400
• 35a08ab451 save authors Anton Romanov 2018-12-05 18:08:47 +0400
• 1f264331fa fix npe Anton Romanov 2018-12-05 17:36:53 +0400
• 7b8f7a2047 format dates Anton Romanov 2018-12-05 17:06:56 +0400
• 54bf5735e5 fix create paper Anton Romanov 2018-12-05 16:51:26 +0400
• 67f440ac8a add rest controller Anton Romanov 2018-12-05 06:00:33 +0000
• 7794738f63 fix js Anton Romanov 2018-12-04 14:49:23 +0400
• 3d4a7b09f3 show status Anton Romanov 2018-12-04 14:48:39 +0400
• dfe44ab842 add validation Anton Romanov 2018-12-04 14:13:01 +0400
• f9670ad0a5 pass values for paper Anton Romanov 2018-12-04 11:35:51 +0400
• f376fedc64 load paper Anton Romanov 2018-11-26 23:07:14 +0400
• aee396f686 Merge branch '14-filter-frontend' into 'master' Anton Romanov 2018-11-23 16:40:15 +0000
• 13f9081aee fix failed commit #145 Anton Romanov 2018-11-23 20:37:24 +0400
• d2d2a7ae71 Merge branch '10-savePaper' into 'master' Anton Romanov 2018-11-23 16:24:26 +0000
• 5fa5d670a5 show paper list in mvc Anton Romanov 2018-11-23 16:45:40 +0400
• f5068f8be9 filter Alyona 2018-11-23 14:17:16 +0400
• a9ea796bbb Merge branch 'master' into 14-filter-frontend Alyona 2018-11-23 14:12:37 +0400
• df6bc223aa Merge remote-tracking branch 'origin/master' Alyona 2018-11-23 14:10:49 +0400
• 5eff1bac81 Merge branch 'master' of C:\Users\катя\IdeaProjects\ng-tracker with conflicts. Alyona 2018-11-23 14:10:36 +0400
• 8fc6d3b569 задача 10(new) #143 Elena 2018-11-23 14:05:23 +0400
• 51e84e22a6 задача 10 Elena 2018-11-23 13:53:20 +0400
• fe6e52a19c Merge branch 'master' into 10-savePaper Elena 2018-11-23 12:39:36 +0400
• e84e542309 fix colors Anton Romanov 2018-11-22 21:48:36 +0400
• 7f1fb168e1 fix colors Anton Romanov 2018-11-22 21:31:41 +0400
• 4163276da3 add paper status Anton Romanov 2018-11-22 21:06:58 +0400
• 1b2db5b5d4 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-22 11:20:08 +0400
• ccd07305ec add mertica Anton Romanov 2018-11-22 11:19:50 +0400
• 724dd6a78a remove empty page Anton Romanov 2018-11-21 15:47:26 +0400
• 161fab55de add toolbar Anton Romanov 2018-11-21 15:47:14 +0400
• 0aec0c3c8e Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-21 15:42:20 +0400
• 908bf814ce Merge branch '31-' into 'master' Anton Romanov 2018-11-21 11:42:47 +0000
• 29586c9313 close failed papers Anton Romanov 2018-11-21 15:40:20 +0400
• f6647d6752 Create grant page #147 T-Midnight 2018-11-21 15:28:41 +0400
• 4e3e882f76 Merge branch '30-main-grants-page' into 'master' Anton Romanov 2018-11-21 08:51:11 +0000
• ef32bba684 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-21 12:46:42 +0400
• 6314ca6ec5 notify if paper deadline in future Anton Romanov 2018-11-21 12:46:27 +0400
• d13644d67d Update dashboard for grants #144 T-Midnight 2018-11-19 12:16:39 +0400
• 58299d749d fix for remove event Anton Romanov 2018-11-19 08:21:22 +0400
• 2dc0b4e27c fix event create conditions Anton Romanov 2018-11-19 07:46:02 +0400
• 6adc96761b fix delete button Anton Romanov 2018-11-18 14:29:41 +0400
• 9a0fa5a170 fix delete button Anton Romanov 2018-11-17 12:31:22 +0400
• 2d78753b06 show events Anton Romanov 2018-11-17 11:56:52 +0400
• c774820d95 fix build script for netbeans Anton Romanov 2018-11-14 17:14:56 +0400
• ec9009be10 show toolbar buttons Anton Romanov 2018-11-14 17:04:40 +0400
• 74d9c5cd20 show toolbar buttons Anton Romanov 2018-11-14 17:04:29 +0400
• 863991953c show paper status Anton Romanov 2018-11-14 17:04:13 +0400
• f587f80eb6 fix code Anton Romanov 2018-11-14 17:03:22 +0400
• 112958a70b fix code Anton Romanov 2018-11-14 15:18:22 +0400
• 06864c7ec8 read dashboard Anton Romanov 2018-11-14 15:15:23 +0400
• 02f762b4f1 filter Alyona 2018-11-14 08:55:46 +0400
• eaf03daba3 Merge branch '14-DB-filter' into 'master' Anton Romanov 2018-11-13 11:46:25 +0000
• 2a76acc7ad filter papers #146 Anton Romanov 2018-11-13 15:41:18 +0400
• 4c0ccbe285 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-11-11 14:28:51 +0400
• 9380b74f67 move class Anton Romanov 2018-11-11 12:43:27 +0400