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

• ca3159a66b Merge branch '87-inviting-user' into 88-change-password Artem.Arefev 2019-05-15 22:35:30 +04:00
• 3226cc3971 87 fixed UserControllerV2 logger Artem.Arefev 2019-05-15 22:27:06 +04:00
• 48a18a3a57 87 fixed imports Artem.Arefev 2019-05-15 22:24:19 +04:00
• d88f67ce00 87 transactional inviting Artem.Arefev 2019-05-15 03:08:21 +04:00
• 11ef644e5e 88 inviting user base Artem.Arefev 2019-05-15 02:48:44 +04:00
• 1e06edfcc0 Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf Nightblade73 2019-05-15 01:28:08 +04:00
• 7952787229 #104 add new tests, fixes Nightblade73 2019-05-15 01:14:02 +04:00
• 00c5d5f755 #104 test refactoring Nightblade73 2019-05-15 00:54:30 +04:00
• 3d02f551cc Merge branch 'lk_v2' into 87-inviting-user Artem.Arefev 2019-05-15 00:53:52 +04:00
• 95fc9da47d lk base, created from dev Artem.Arefev 2019-05-15 00:49:54 +04:00
• 1bf1ad915d Merge branch 'dev' into 44-check-complete-deadlines T-Midnight 2019-05-14 23:59:22 +04:00
• 9ca8d15b8f #44 update fragment in conference T-Midnight 2019-05-14 23:55:08 +04:00
• 8c13adb4aa #44 replace paper status fragment T-Midnight 2019-05-14 23:46:15 +04:00
• 8747ac1619 #44 change icon for grant T-Midnight 2019-05-14 23:44:00 +04:00
• 72923312b7 #44 add title to paper status fragment T-Midnight 2019-05-14 23:42:49 +04:00
• a50aa383d9 merged with dev lk Artem.Arefev 2019-05-14 22:21:27 +04:00
• 11cab955b4 #104 test create Nightblade73 2019-05-14 18:51:03 +04:00
• c88c77cd7d #104 test find one dto Nightblade73 2019-05-14 18:20:01 +04:00
• 1c5c05b5e4 #104 test take part Nightblade73 2019-05-14 18:01:50 +04:00
• e6cb991463 #104 test is member Nightblade73 2019-05-14 17:54:18 +04:00
• a8d987b01f #104 test copy from dto method Nightblade73 2019-05-14 17:49:22 +04:00
• 3a9fde3404 #104 setUp fields Nightblade73 2019-05-14 16:20:19 +04:00
• 9da5fd8a7a #104 shock, the first unit test works Nightblade73 2019-05-14 00:02:30 +04:00
• 51851baa48 Merge branch '103-autotest-conf' into 'dev' Anton Romanov 2019-05-13 19:46:29 +00:00
• 10a9bd7a28 Merge branch '111-unique-name-control-conf' into 'dev' Anton Romanov 2019-05-13 19:20:44 +00:00
• 58a8495835 Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf #217 Nightblade73 2019-05-13 20:27:52 +04:00
• ab59cb524e #103 fix code style Nightblade73 2019-05-13 20:26:13 +04:00
• 1f8722e3ff #103 code refactoring Nightblade73 2019-05-13 20:13:53 +04:00
• 6044d6f8e3 #111 save method refactor #213 Nightblade73 2019-05-13 19:08:21 +04:00
• 395cf57cc1 #44 finish with papers T-Midnight 2019-05-13 16:29:33 +04:00
• a3afdeb988 Merge branch '123-student-task-timeline' into 'dev' Anton Romanov 2019-05-13 07:15:57 +00:00
• aaa21d591d Merge branch '121-reduce-paper-title' into 'dev' Anton Romanov 2019-05-13 06:54:49 +00:00
• 48d7131593 gl_88 inviting user gl_88 arefiev1997 2019-05-13 03:16:37 +04:00
• c612e35ad9 #44 add check for papers T-Midnight 2019-05-12 23:27:19 +04:00
• 9abcf7792e Merge branch 'lk' into gl_88 arefiev1997 2019-05-12 23:07:59 +04:00
• 9c53257729 fixed lk page arefiev1997 2019-05-12 22:26:50 +04:00
• f6830d499b #121 update view #216 T-Midnight 2019-05-12 15:31:50 +04:00
• 99ec7af319 #121 reduce paper title T-Midnight 2019-05-12 15:30:09 +04:00
• e1907d3169 #121 change Paper to PaperDto in attaching papers T-Midnight 2019-05-12 15:28:47 +04:00
• 451e7e5d04 #103 fix code style Nightblade73 2019-05-12 13:50:46 +04:00
• 5cbbb6c319 #103 fix code style Nightblade73 2019-05-12 13:49:49 +04:00
• 70062992ae #103 clear code Nightblade73 2019-05-12 13:45:17 +04:00
• fe53c86136 #103 fixed delete conf test Nightblade73 2019-05-12 13:42:50 +04:00
• 5b4180e685 #123 fixing layout #218 ASH 2019-05-12 11:04:43 +04:00
• a11e10dec4 #123 adding task timeline ASH 2019-05-12 01:00:26 +04:00
• d846192046 #111 fixes Nightblade73 2019-05-12 00:28:03 +04:00
• 7798508d4f Merge branch 'dev' into 79-students-tags-generation ASH 2019-05-11 23:26:21 +04:00
• c59bb45c70 #79 fixing codestyle ASH 2019-05-11 23:06:30 +04:00
• 0de34c89fe #79 fixing planner and year generation ASH 2019-05-11 22:58:57 +04:00
• ed8855272f lk base arefiev1997 2019-05-11 22:06:31 +04:00
• b2e8a43cee #103 delete conf test Nightblade73 2019-05-11 00:51:57 +04:00
• 3f32a61ed2 Merge remote-tracking branch 'origin/103-autotest-conf' into 103-autotest-conf Nightblade73 2019-05-10 23:38:54 +04:00
• 6edcf8f594 #103 add sort and filter test, fixed delete conference, if it has fk with event Nightblade73 2019-05-10 21:15:49 +04:00
• 4686406954 #103 add undock article Nightblade73 2019-05-10 21:15:49 +04:00
• 4e4e7ae194 #103 add paper transition Nightblade73 2019-05-10 20:54:43 +04:00
• cad8682088 #103 add adding article Nightblade73 2019-05-10 20:07:55 +04:00
• d9a4224317 #103 add attach article Nightblade73 2019-05-10 19:15:22 +04:00
• 7b4318a3b5 #103 add delete deadline Nightblade73 2019-05-10 17:40:24 +04:00
• 0cb7b05c25 #103 add check take part Nightblade73 2019-05-10 17:21:36 +04:00
• 253f4b4aad #103 add check new deadline Nightblade73 2019-05-10 17:03:47 +04:00
• 1ad66d6fb1 #103 change name method test Nightblade73 2019-05-10 15:54:12 +04:00
• 961fdf9397 #70 added conference class, added create method test Nightblade73 2019-05-10 15:07:47 +04:00
• ff7f535980 Merge branch '119-notification-grants' into 'dev' Anton Romanov 2019-05-09 04:18:55 +00:00
• 77e2ad0651 #119 add send notification functions #211 T-Midnight 2019-05-09 01:24:55 +04:00
• 74a8dcbd8a #119 add leader changed notification T-Midnight 2019-05-09 01:23:17 +04:00
• 4262446aef #119 create all mail templates T-Midnight 2019-05-09 01:21:56 +04:00
• b640dea99a #119 create scheduler T-Midnight 2019-05-09 00:45:54 +04:00
• 2d9fd05060 #119 create grantCreateNotification mail template T-Midnight 2019-05-08 23:32:37 +04:00
• b57142e28f #70 added unique name control Nightblade73 2019-05-08 17:08:37 +04:00
• e3ad5ba510 Merge remote-tracking branch 'remotes/origin/dev' into 119-notification-grants T-Midnight 2019-05-08 16:22:39 +04:00
• 09aa3d0084 Merge branch '122-bug-leader-grants' into 'dev' Anton Romanov 2019-05-08 09:25:37 +00:00
• 662847698e Merge branch '109-paper-attach-control' into 'dev' Anton Romanov 2019-05-08 09:10:03 +00:00
• 2fba252df0 #109 show other paper attachs #214 Семенова Мария 2019-05-07 23:53:10 +04:00
• 7ffe04f1db #122 move to right directory #215 T-Midnight 2019-05-07 22:47:27 +04:00
• d244437858 #122 fix bug T-Midnight 2019-05-07 22:35:44 +04:00
• 934d194df1 #119 gelete unnecessary column T-Midnight 2019-05-07 22:15:49 +04:00
• 1e07c5424d #109 only one conference for paper Семенова Мария 2019-05-07 21:35:50 +04:00
• dffd839905 #109 only uncompleted for grant Семенова Мария 2019-05-07 20:26:49 +04:00
• 279cc0e18a #101 project model edited Васин Антон 2019-05-07 14:00:24 +03:00
• b1e101c940 #101 db event edited Васин Антон 2019-05-07 13:34:00 +03:00
• 2dae39a100 #119 create grants notification service T-Midnight 2019-05-06 23:57:16 +04:00
• 241c489b21 #98 deadline edited Васин Антон 2019-05-06 22:10:40 +03:00
• 52ae197f34 Merge branch 'dev' into 98-project-tasks Васин Антон 2019-05-06 21:57:30 +03:00
• 4025aa67ca #98 project completion added Васин Антон 2019-05-06 21:51:58 +03:00
• 65dea9bce2 #79 adding task planer generation ASH 2019-05-06 22:39:08 +04: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
• 82ab40a608 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-05-06 13:04:13 +03:00
• 2dff183662 Merge branch '32-timeline-grants' into 'dev' Anton Romanov 2019-05-06 07:06:04 +00:00
• 09aa0bd4d6 Merge remote-tracking branch 'origin/move-to-jdk11' into lk arefiev1997 2019-05-06 00:38:58 +04:00
• da382b659a #32 add deadlines on timeline page #210 T-Midnight 2019-05-06 00:32:28 +04:00
• 114f6769ac #32 create changelog T-Midnight 2019-05-05 23:54:02 +04:00
• beb334f2fa #32 add variable "events" T-Midnight 2019-05-04 23:59:03 +04:00
• a53a12fa55 Merge remote-tracking branch 'origin/move-to-jdk11' into gl_87 gl_87 arefiev1997 2019-05-04 12:08:42 +04:00
• 68737b976f Merge branch '117-filter-users' into 'dev' Anton Romanov 2019-05-03 05:58:19 +00:00
• 6eed8591b4 Merge branch '70-notification-conf' into 'dev' Anton Romanov 2019-05-03 05:56:33 +00:00
• 74d43dcd0d #117 resolve last discussion #204 T-Midnight 2019-05-02 22:49:58 +04:00
• 0955388f27 #117 fix port T-Midnight 2019-05-02 22:00:53 +04:00
• de625923e9 #117 resolve discussions v.2 T-Midnight 2019-05-02 21:56:54 +04:00
• b334b5d70e #117 resolve discussions T-Midnight 2019-05-02 21:42:06 +04:00