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

• eb87c6d52f #98 project statuses edited a.vasin 2019-05-28 00:40:36 +04:00
• a35bcfce1b #112 merged with dev Artem.Arefev 2019-05-27 22:47:01 +04:00
• 7388e12e3f #98 edited project executors Васин Антон 2019-05-27 18:19:31 +03:00
• 4bb4fd6bca #98 changelog edited Васин Антон 2019-05-27 09:35:58 +03:00
• 4eeb79ab80 #98 changelog edited Васин Антон 2019-05-27 09:19:52 +03:00
• d1182ea7c3 Merge remote-tracking branch 'origin/dev' into 93-activites-analytics Artem.Arefev 2019-05-27 02:12:22 +04:00
• 482e2b3595 #112 base ping activities Artem.Arefev 2019-05-27 00:42:43 +04:00
• 308da4113d fix week number calculation Anton Romanov 2019-05-24 13:26:02 +04:00
• 6258e7b6bf Merge branch '91-users-info' into 'dev' Anton Romanov 2019-05-27 18:03:41 +00:00
• c4b35ddf6a #91 merged with dev #226 Artem.Arefev 2019-05-27 21:53:55 +04:00
• 336a16ff73 some refactor Anton Romanov 2019-05-27 09:14:24 +04:00
• 0e7fdac980 Merge remote-tracking branch 'origin/dev' into 91-users-info Artem.Arefev 2019-05-27 00:42:54 +04:00
• 2b911017b1 Merge branch '120-kias' into 'dev' Anton Romanov 2019-05-25 17:40:59 +00:00
• 0cd3055176 #120 disable tests #221 Anton Romanov 2019-05-25 21:33:06 +04:00
• 280c39dae4 #120 fix variable Anton Romanov 2019-05-25 21:32:20 +04:00
• 828d320e0f #120 try to run test in docker Anton Romanov 2019-05-25 21:16:26 +04:00
• 678397e970 #120 test classes refactor Anton Romanov 2019-05-25 21:15:54 +04:00
• 916bbae414 #120 add debug email Anton Romanov 2019-05-25 21:15:21 +04:00
• 477a9fd6ff #120 move to service Anton Romanov 2019-05-25 15:48:32 +04:00
• 59d6edb818 #120 refactor Anton Romanov 2019-05-25 15:42:08 +04:00
• f4479c2ab7 #91 fixed app properties Artem.Arefev 2019-05-25 14:11:57 +04:00
• 193b2b3a32 #91 using RestTemplate & show error on timetable loading exception Artem.Arefev 2019-05-25 14:03:43 +04:00
• 837a9f465c #120 merge dev Anton Romanov 2019-05-25 12:39:44 +04:00
• eba3592410 Merge branch '127-paper-references' into 'dev' Anton Romanov 2019-05-24 19:43:27 +00:00
• 22195813ae #127 fixes #235 Семенова Мария 2019-05-24 16:15:38 +04:00
• 43e7b9fe1f Merge branch 'dev' into 127-paper-references Семенова Мария 2019-05-24 16:14:02 +04:00
• c9ecae9842 Merge branch '104-students-mod-tests' into 'dev' Anton Romanov 2019-05-24 06:37:03 +00:00
• d4364b9767 Merge branch '89-restore-password' into 'dev' Anton Romanov 2019-05-24 06:34:18 +00:00
• 505a054cc8 Merge remote-tracking branch 'origin/dev' into 91-users-info Artem.Arefev 2019-05-24 01:53:54 +04:00
• 8bb9e3a844 #89 jquery #228 Artem.Arefev 2019-05-24 01:52:50 +04:00
• 661da17f73 Merge remote-tracking branch 'origin/dev' into 89-restore-password Artem.Arefev 2019-05-24 01:36:01 +04:00
• 01bcac2680 #127 allow nullable year Семенова Мария 2019-05-24 00:26:38 +04:00
• 421ed635e8 Merge branch 'dev' into 127-paper-references Семенова Мария 2019-05-24 00:18:07 +04:00
• 24a1276005 #127 autocomplete Семенова Мария 2019-05-24 00:14:46 +04:00
• 512a805e8c #127 references formatting Семенова Мария 2019-05-23 17:26:22 +04:00
• ab17b9f152 #104 mod tests period task #234 ASH 2019-05-23 16:45:09 +04:00
• 181086c9db #120 disable start browser on run application Anton Romanov 2019-05-23 16:36:48 +04:00
• 82e454a50b #104 mod tests generate task ASH 2019-05-23 16:17:04 +04:00
• c303d65c8d #120 move to services Anton Romanov 2019-05-23 16:02:44 +04:00
• 7c1b124c94 #127 references tab, crud Семенова Мария 2019-05-23 15:48:46 +04:00
• 29cfadef02 #127 reference model, schema Семенова Мария 2019-05-23 15:02:55 +04:00
• ef521123dd #104 mod tests check repeatings ASH 2019-05-23 14:31:34 +04:00
• 82ae42f7fc Merge branch '125-bug-date-conf' into 'dev' Anton Romanov 2019-05-23 09:56:21 +00:00
• af09938e66 Merge branch '103-students-integ-tests' into 'dev' Anton Romanov 2019-05-23 09:50:30 +00:00
• 1c8359f900 #103 modify files permissions #227 Anton Romanov 2019-05-23 13:54:44 +04:00
• 47131f1fb7 #103 add tests for papers T-Midnight 2019-05-23 13:43:18 +04:00
• 284a3f51e9 #104 mod tests filter and create tasks ASH 2019-05-23 12:07:34 +04:00
• bd24525315 #103 integration tests ASH 2019-05-23 00:15:03 +04:00
• 3e9bbb3584 #103 create tests for create, update and delete functions T-Midnight 2019-05-22 23:15:04 +04:00
• 16885cc94f #103 update overriding method T-Midnight 2019-05-22 23:12:30 +04:00
• b1c090b0ea #103 add selenium-support library T-Midnight 2019-05-22 23:11:06 +04:00
• ecda92326b #103 create blank classes T-Midnight 2019-05-22 16:04:51 +04:00
• 457f1da985 #120 fix checkRun and checkStyle T-Midnight 2019-05-22 15:45:23 +04:00
• 5f214620bf #120 use loading from kias T-Midnight 2019-05-22 15:16:20 +04:00
• c21739bfc6 #120 parse kias page T-Midnight 2019-05-22 15:12:45 +04:00
• bab621677e #120 add methods for checking unique title and date of grant T-Midnight 2019-05-22 15:10:51 +04:00
• 49e407f455 #90 diagrams #231 90-edit-workload Artem.Arefev 2019-05-22 03:34:11 +04:00
• 8b52518c4a #125 check method #230 Nightblade73 2019-05-21 15:53:42 +04:00
• d7c4e6b222 #91 base users dashboard Artem.Arefev 2019-05-21 02:09:07 +04:00
• bb9f412480 #120 check unique grant name T-Midnight 2019-05-20 20:49:03 +04:00
• c0e66e81a2 #120 drop unnecessary table column T-Midnight 2019-05-20 20:47:10 +04:00
• 1823c1ba50 #120 create kias page T-Midnight 2019-05-20 18:37:24 +04:00
• e468646cd6 89 removed getCurrentUser Artem.Arefev 2019-05-19 00:47:49 +04:00
• 90799356ab 89 password reset Artem.Arefev 2019-05-19 00:42:24 +04:00
• 59bc0dbd34 disable dev mode on demo #229 1-audit-listener Anton Romanov 2019-05-18 13:13:09 +04:00
• d076f35ff7 fix user timetable url Anton Romanov 2019-05-18 13:00:02 +04:00
• 56f083e757 Merge branch '87-inviting-user' into 'dev' #225 #224 89- Anton Romanov 2019-05-17 10:36:07 +00:00
• 532e007b0b 87 merged with dev #222 Artem.Arefev 2019-05-17 14:31:08 +04:00
• 3dbf635fb6 Merge branch '88-change-password' into 'dev' Anton Romanov 2019-05-17 10:23:24 +00:00
• 3da374326b 88 replacing all alerts in users.js #223 Artem.Arefev 2019-05-17 14:16:41 +04:00
• 4213524dbd Merge branch 'dev' into 98-project-tasks Васин Антон 2019-05-17 11:40:21 +03:00
• f960d4de1b #98 deadline model edited Васин Антон 2019-05-17 11:30:26 +03:00
• 740adc5318 88 js using showFeedbackMessage Artem.Arefev 2019-05-17 12:23:45 +04:00
• b8281c527a 87 removed unused imports Artem.Arefev 2019-05-17 12:20:55 +04:00
• 7163937a53 87 using showFeedBackMessage Artem.Arefev 2019-05-17 12:20:08 +04:00
• 097f7827b0 #98 db edited Васин Антон 2019-05-17 10:30:34 +03:00
• 83aba158b6 Merge branch '104-module-test-conf' into 'dev' Anton Romanov 2019-05-17 07:27:21 +00:00
• 50314246f5 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-05-17 10:10:38 +03:00
• 76d3adb464 87 small fix whitespace Artem.Arefev 2019-05-17 08:58:27 +04:00
• 64357c2508 88 fixed changePassword request data Artem.Arefev 2019-05-17 04:35:33 +04:00
• 6a62e61caf 87 error handling + ajax + rest Artem.Arefev 2019-05-17 04:34:03 +04:00
• b9748905d1 Merge branch '88-change-password' into 87-inviting-user Artem.Arefev 2019-05-17 03:59:28 +04:00
• fbd618a6d0 88 changed error text to russian Artem.Arefev 2019-05-17 03:59:09 +04:00
• 052e4a1aef 88 rest changePassword + ajax Artem.Arefev 2019-05-17 03:55:22 +04:00
• 4fc8bc3717 Merge branch '87-inviting-user' into 88-change-password Artem.Arefev 2019-05-17 02:01:56 +04:00
• 728fa42972 87 error handling Artem.Arefev 2019-05-17 02:01:26 +04:00
• dc34c7bfb7 #104 fixed conference-row style #219 Nightblade73 2019-05-16 18:07:18 +04:00
• 5263393379 #104 remove chart example from dashboard Nightblade73 2019-05-16 17:55:34 +04:00
• 80de18d3ee #104 create fixed, remove update Nightblade73 2019-05-16 16:31:10 +04:00
• bde9cb51fb #104 some methods fixed Nightblade73 2019-05-16 15:55:29 +04:00
• c0937d721a #104 removePaper, addPaper, takePart fixed Nightblade73 2019-05-16 15:35:32 +04:00
• ce7b4c9c7a #104 addDeadline, removeDeadline fixed Nightblade73 2019-05-16 13:33:26 +04:00
• 1d19472f82 #44 small icons Anton Romanov 2019-05-16 07:59:25 +04:00
• 19a6b45cf9 Merge branch '79-students-tags-generation' into 'dev' Anton Romanov 2019-05-16 03:30:46 +00:00
• c47d4f8a05 #88 removed unused imports Artem.Arefev 2019-05-16 01:17:04 +04:00
• 33f62c04e7 Merge branch '87-inviting-user' into 88-change-password Artem.Arefev 2019-05-16 01:03:14 +04:00
• d50673f5fa 87-inviting-user small fix in mail template, and changed default user name Artem.Arefev 2019-05-16 01:01:31 +04:00
• f8f501b8ff 88-change-password base Artem.Arefev 2019-05-16 00:38:53 +04:00
• cd1caa559e Merge branch 'dev' into 79-students-tags-generation #207 ASH 2019-05-16 00:14:05 +04:00
• bc9cca62d6 #79 refactoring ASH 2019-05-15 23:47:05 +04:00