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

• 29df7120bf Delete DeadlineDTO and update usages #159 T-Midnight 2019-03-18 14:27:54 +04:00
• 0764d961fa #13 add fileDataDto Семенова Мария 2019-03-18 13:00:34 +04:00
• 7b601c744f #13 change model, schema Семенова Мария 2019-03-18 11:07:30 +04:00
• 6296b661a9 #53 added conference js file Nightblade73 2019-03-16 14:44:34 +04:00
• a236fc50bc #53 added datatables lib support Nightblade73 2019-03-16 14:39:56 +04:00
• 99d85a5648 Add new status for grant T-Midnight 2019-03-15 12:24:02 +04:00
• c25c17d8ba Rename title T-Midnight 2019-03-15 12:19:25 +04:00
• de96be2471 Create Navigation class to avoid "magic strings" and code duplication T-Midnight 2019-03-15 12:19:01 +04:00
• ae58a5b6e4 Merge branch '72-link-to-timetable' into 'dev' Anton Romanov 2019-03-13 07:16:32 +00:00
• 90bb94d864 add patronymic #158 Anton Romanov 2019-03-12 14:44:11 +04:00
• 48894b2176 display user in filter Anton Romanov 2019-03-12 13:40:48 +04:00
• da7a17ee49 add service methods Anton Romanov 2019-03-12 12:51:59 +03:00
• 20ecb47867 add timetable link Anton Romanov 2019-03-12 12:35:09 +03:00
• bd975c53f3 #71 adding pages and layout ASH 2019-03-11 22:46:51 +04:00
• 3169551968 Merge branch '54-view-conference' into 'dev' #157 Anton Romanov 2019-03-11 10:49:07 +00:00
• 5cb865eb70 #54 deleted edit btn #153 Nightblade73 2019-03-11 14:43:32 +04:00
• 2fec35264c #54 add back link, css fixes Nightblade73 2019-03-11 12:58:40 +04:00
• f90d92b19d #54 add custom paper-list Nightblade73 2019-03-11 11:36:00 +04:00
• d332282e03 #54 add custom deadline-list, add edit-button, add edit and delete icons Nightblade73 2019-03-10 22:15:09 +04:00
• 7fff337c3a #54 add member list Nightblade73 2019-03-07 22:50:37 +04:00
• 76ec5add30 #54 part of make-up Nightblade73 2019-03-06 20:51:46 +04:00
• c21a65a075 #54 add transitions Nightblade73 2019-03-06 16:48:51 +04:00
• 42fdb51337 fix login Anton Romanov 2019-03-06 16:40:33 +04:00
• 93e68b1929 #50 creating html page, changing href Nightblade73 2019-03-06 16:27:25 +04:00
• febdb0b027 Merge branch '29-page-header' into 'dev' Anton Romanov 2019-03-06 12:25:34 +00:00
• cb73340c3f fix css #155 Anton Romanov 2019-03-06 16:19:43 +04:00
• 4226be6406 fix props Anton Romanov 2019-03-06 14:36:46 +03:00
• dd90bd24a9 fix props Anton Romanov 2019-03-06 14:35:09 +03:00
• 285b43c63c header fix user 2019-03-06 14:25:02 +03:00
• 13131186bf Merge branch 'dev' into 'master' master Anton Romanov 2019-03-04 10:04:02 +00:00
• 4f47b1beb6 fix code #154 Anton Romanov 2019-03-04 10:28:46 +04:00
• e2c12d9fb2 fix code Anton Romanov 2019-03-04 10:24:30 +04:00
• 3d8e8ca4f2 fix branch Anton Romanov 2019-03-01 11:27:57 +04:00
• 0fccbdc973 add links to papers Anton Romanov 2019-03-01 11:22:25 +04:00
• 39c25c7b20 add links to papers Anton Romanov 2019-03-01 11:21:25 +04:00
• a997f5fffa Update README.md Anton Romanov 2019-02-03 14:54:02 +00:00
• f7bbf4d746 Merge branch 'dev' into 'master' Anton Romanov 2019-01-16 21:04:20 +00:00
• c00390a17b filter dashboard papers #152 Anton Romanov 2019-01-17 01:01:26 +04:00
• 779bc3eafc fix failed conditions Anton Romanov 2019-01-17 00:57:34 +04:00
• 2728a0ca01 Add: register page, account info page 48-crud AlexGames73 2019-01-11 23:08:13 +04:00
• cf0e05c918 Fix gradle v2 AlexGames73 2019-01-10 21:51:11 +04:00
• bd7e12220b Fix gradle AlexGames73 2019-01-10 21:46:54 +04:00
• 383bbc343f Add ReactJS to project AlexGames73 2019-01-10 17:50:23 +04:00
• c17591bf10 Update README.md Anton Romanov 2019-01-08 19:55:27 +00:00
• a18400a97c Update README.md Anton Romanov 2019-01-08 19:36:36 +00:00
• ffb3c65118 fix notifications Anton Romanov 2019-01-05 08:01:07 +04:00
• eab71c1210 fix notifications Anton Romanov 2019-01-04 17:41:48 +04:00
• cec13bb677 some layout fix Anton Romanov 2018-12-30 19:23:11 +04:00
• edc9c7c090 sort deadlines Anton Romanov 2018-12-30 19:22:51 +04:00
• 2cac98be50 fix enum field name Anton Romanov 2018-12-29 09:58:37 +04:00
• 7a490ef7a5 Merge branch '35-' into 'master' Anton Romanov 2018-12-28 10:04:42 +00:00
• ebb036ee71 some refactor #151 Anton Romanov 2018-12-28 14:00:09 +04:00
• ce78f8ad66 some refactor Anton Romanov 2018-12-28 13:57:20 +04:00
• bcc64cda96 Create model folder for grant T-Midnight 2018-12-25 12:50:14 +04:00
• 816d115cc8 Hide button "Add Project" when project already exists (not perfect) T-Midnight 2018-12-25 02:44:50 +04:00
• 18ad291e82 Made button "delete grant" visible T-Midnight 2018-12-25 00:14:38 +04:00
• fcbd91760d Rename table grant to grants T-Midnight 2018-12-24 23:39:19 +04:00
• d7721ce19d Update classes T-Midnight 2018-12-24 15:20:57 +04:00
• 2f68339ba2 Add thymeleaf template T-Midnight 2018-12-24 15:18:52 +04:00
• 410d0d9634 Create service&repository for Project T-Midnight 2018-12-24 13:05:37 +04:00
• 307b640e8e Create js for grants T-Midnight 2018-12-24 11:07:02 +04:00
• 25278bcdd8 Create html fragments T-Midnight 2018-12-24 11:03:03 +04:00
• a2fa574888 Create Controller&Service T-Midnight 2018-12-23 02:22:41 +04:00
• c2a32d6c27 Update ProjectDto T-Midnight 2018-12-23 02:22:31 +04:00
• 9e5f3d7247 Add constructor T-Midnight 2018-12-23 02:22:24 +04:00
• edd38beb67 Add function getNextDeadline() T-Midnight 2018-12-23 02:22:06 +04:00
• eff5344aea Create GrantRepository T-Midnight 2018-12-22 18:03:18 +04:00
• 42d33d1be8 Create setters for GrantDto T-Midnight 2018-12-22 03:31:43 +04:00
• 469a3ad07d fix display paper title Anton Romanov 2018-12-21 00:07:26 +04:00
• 6e14860c34 fix paper status template Anton Romanov 2018-12-20 23:30:25 +04:00
• 823f7a7743 try to fix template resolvers, step 4 Anton Romanov 2018-12-19 01:29:54 +04:00
• 5a9ccbcfc1 try to fix template resolvers, step 3 Anton Romanov 2018-12-19 01:00:08 +04:00
• e8bad4e24e try to fix template resolvers, step 2 Anton Romanov 2018-12-19 00:44:12 +04:00
• 7089bd6c42 try to fix template resolvers Anton Romanov 2018-12-19 00:22:36 +04:00
• 9ec7b42972 Merge remote-tracking branch 'origin/master' Anton Romanov 2018-12-19 00:11:39 +04:00
• 486a0ac50a try to fix gradlew Anton Romanov 2018-12-19 00:09:07 +04:00
• fbaaac3a91 sort filtered papers Anton Romanov 2018-12-18 23:02:48 +04:00
• 7dc34e1a82 Merge branch '47-statuses' into 'master' Anton Romanov 2018-12-18 18:45:43 +00:00
• fa1c4a9c1c add statuses #150 Anton Romanov 2018-12-18 22:42:34 +04:00
• 503f7f68bc Merge branch '46-mvc' into 'master' Anton Romanov 2018-12-18 18:18:25 +00:00
• 468f440d9d fix filer #149 Anton Romanov 2018-12-18 22:15:21 +04:00
• ec1e3ff052 fix scripts Anton Romanov 2018-12-18 19:40:23 +04:00
• dc5abe1508 show authors Anton Romanov 2018-12-18 19:23:15 +04:00
• c88ce3ac37 confirm delete paper Anton Romanov 2018-12-18 18:47:15 +04:00
• c2c420027b add papers navigation Anton Romanov 2018-12-18 18:05:30 +04:00
• 3e8b74f362 fix submit form Anton Romanov 2018-12-17 17:56:48 +04:00
• d5121c895e fix email notification Anton Romanov 2018-12-17 17:29:06 +04:00
• 05296bb26e fix route Anton Romanov 2018-12-17 17:28:52 +04:00
• 59e2c9b544 edit deadlines Anton Romanov 2018-12-17 13:46:08 +04:00
• 54ea705890 Merge branch 'master' into 46-mvc Anton Romanov 2018-12-14 16:00:46 +04:00
• ac569ed9a9 Merge branch 'master' into 46-mvc Anton Romanov 2018-12-14 16:00:33 +04:00
• 932cb71e71 Merge branch '36-' into 'master' Anton Romanov 2018-12-11 11:14:21 +00:00
• d71a8d2c83 move classes, add deadline to entities, fix db changelogs #148 Anton Romanov 2018-12-11 15:08:35 +04:00
• 590cd16abe Create model for grant, deadline and project T-Midnight 2018-12-08 23:53:38 +04:00
• 35a08ab451 save authors Anton Romanov 2018-12-05 18:08:47 +04:00
• 1f264331fa fix npe Anton Romanov 2018-12-05 17:36:53 +04:00
• 7b8f7a2047 format dates Anton Romanov 2018-12-05 17:06:56 +04:00
• 54bf5735e5 fix create paper Anton Romanov 2018-12-05 16:51:26 +04:00
• 67f440ac8a add rest controller Anton Romanov 2018-12-05 06:00:33 +00:00
• 7794738f63 fix js Anton Romanov 2018-12-04 14:49:23 +04:00