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

e468646cd6 89 removed getCurrentUser Artem.Arefev 2019-05-19 00:47:49 +0400
90799356ab 89 password reset Artem.Arefev 2019-05-19 00:42:24 +0400
59bc0dbd34 disable dev mode on demo #229 1-audit-listener Anton Romanov 2019-05-18 13:13:09 +0400
d076f35ff7 fix user timetable url Anton Romanov 2019-05-18 13:00:02 +0400
56f083e757 Merge branch '87-inviting-user' into 'dev' #225 #224 89- Anton Romanov 2019-05-17 10:36:07 +0000
532e007b0b 87 merged with dev #222 Artem.Arefev 2019-05-17 14:31:08 +0400
3dbf635fb6 Merge branch '88-change-password' into 'dev' Anton Romanov 2019-05-17 10:23:24 +0000
3da374326b 88 replacing all alerts in users.js #223 Artem.Arefev 2019-05-17 14:16:41 +0400
4213524dbd Merge branch 'dev' into 98-project-tasks Васин Антон 2019-05-17 11:40:21 +0300
f960d4de1b #98 deadline model edited Васин Антон 2019-05-17 11:30:26 +0300
740adc5318 88 js using showFeedbackMessage Artem.Arefev 2019-05-17 12:23:45 +0400
b8281c527a 87 removed unused imports Artem.Arefev 2019-05-17 12:20:55 +0400
7163937a53 87 using showFeedBackMessage Artem.Arefev 2019-05-17 12:20:08 +0400
097f7827b0 #98 db edited Васин Антон 2019-05-17 10:30:34 +0300
83aba158b6 Merge branch '104-module-test-conf' into 'dev' Anton Romanov 2019-05-17 07:27:21 +0000
50314246f5 Merge branch 'dev' of https://gitlab.com/romanov73/ng-tracker into dev Васин Антон 2019-05-17 10:10:38 +0300
76d3adb464 87 small fix whitespace Artem.Arefev 2019-05-17 08:58:27 +0400
64357c2508 88 fixed changePassword request data Artem.Arefev 2019-05-17 04:35:33 +0400
6a62e61caf 87 error handling + ajax + rest Artem.Arefev 2019-05-17 04:34:03 +0400
b9748905d1 Merge branch '88-change-password' into 87-inviting-user Artem.Arefev 2019-05-17 03:59:28 +0400
fbd618a6d0 88 changed error text to russian Artem.Arefev 2019-05-17 03:59:09 +0400
052e4a1aef 88 rest changePassword + ajax Artem.Arefev 2019-05-17 03:55:22 +0400
4fc8bc3717 Merge branch '87-inviting-user' into 88-change-password Artem.Arefev 2019-05-17 02:01:56 +0400
728fa42972 87 error handling Artem.Arefev 2019-05-17 02:01:26 +0400
dc34c7bfb7 #104 fixed conference-row style #219 Nightblade73 2019-05-16 18:07:18 +0400
5263393379 #104 remove chart example from dashboard Nightblade73 2019-05-16 17:55:34 +0400
80de18d3ee #104 create fixed, remove update Nightblade73 2019-05-16 16:31:10 +0400
bde9cb51fb #104 some methods fixed Nightblade73 2019-05-16 15:55:29 +0400
c0937d721a #104 removePaper, addPaper, takePart fixed Nightblade73 2019-05-16 15:35:32 +0400
ce7b4c9c7a #104 addDeadline, removeDeadline fixed Nightblade73 2019-05-16 13:33:26 +0400
1d19472f82 #44 small icons Anton Romanov 2019-05-16 07:59:25 +0400
19a6b45cf9 Merge branch '79-students-tags-generation' into 'dev' Anton Romanov 2019-05-16 03:30:46 +0000
c47d4f8a05 #88 removed unused imports Artem.Arefev 2019-05-16 01:17:04 +0400
33f62c04e7 Merge branch '87-inviting-user' into 88-change-password Artem.Arefev 2019-05-16 01:03:14 +0400
d50673f5fa 87-inviting-user small fix in mail template, and changed default user name Artem.Arefev 2019-05-16 01:01:31 +0400
f8f501b8ff 88-change-password base Artem.Arefev 2019-05-16 00:38:53 +0400
cd1caa559e Merge branch 'dev' into 79-students-tags-generation #207 ASH 2019-05-16 00:14:05 +0400
bc9cca62d6 #79 refactoring ASH 2019-05-15 23:47:05 +0400
ca3159a66b Merge branch '87-inviting-user' into 88-change-password Artem.Arefev 2019-05-15 22:35:30 +0400
3226cc3971 87 fixed UserControllerV2 logger Artem.Arefev 2019-05-15 22:27:06 +0400
48a18a3a57 87 fixed imports Artem.Arefev 2019-05-15 22:24:19 +0400
d88f67ce00 87 transactional inviting Artem.Arefev 2019-05-15 03:08:21 +0400
11ef644e5e 88 inviting user base Artem.Arefev 2019-05-15 02:48:44 +0400
1e06edfcc0 Merge remote-tracking branch 'remotes/origin/dev' into 104-module-test-conf Nightblade73 2019-05-15 01:28:08 +0400
7952787229 #104 add new tests, fixes Nightblade73 2019-05-15 01:14:02 +0400
00c5d5f755 #104 test refactoring Nightblade73 2019-05-15 00:54:30 +0400
3d02f551cc Merge branch 'lk_v2' into 87-inviting-user Artem.Arefev 2019-05-15 00:53:52 +0400
95fc9da47d lk base, created from dev Artem.Arefev 2019-05-15 00:49:54 +0400
1bf1ad915d Merge branch 'dev' into 44-check-complete-deadlines T-Midnight 2019-05-14 23:59:22 +0400
9ca8d15b8f #44 update fragment in conference T-Midnight 2019-05-14 23:55:08 +0400
8c13adb4aa #44 replace paper status fragment T-Midnight 2019-05-14 23:46:15 +0400
8747ac1619 #44 change icon for grant T-Midnight 2019-05-14 23:44:00 +0400
72923312b7 #44 add title to paper status fragment T-Midnight 2019-05-14 23:42:49 +0400
a50aa383d9 merged with dev lk Artem.Arefev 2019-05-14 22:21:27 +0400
11cab955b4 #104 test create Nightblade73 2019-05-14 18:51:03 +0400
c88c77cd7d #104 test find one dto Nightblade73 2019-05-14 18:20:01 +0400
1c5c05b5e4 #104 test take part Nightblade73 2019-05-14 18:01:50 +0400
e6cb991463 #104 test is member Nightblade73 2019-05-14 17:54:18 +0400
a8d987b01f #104 test copy from dto method Nightblade73 2019-05-14 17:49:22 +0400
3a9fde3404 #104 setUp fields Nightblade73 2019-05-14 16:20:19 +0400
9da5fd8a7a #104 shock, the first unit test works Nightblade73 2019-05-14 00:02:30 +0400
51851baa48 Merge branch '103-autotest-conf' into 'dev' Anton Romanov 2019-05-13 19:46:29 +0000
10a9bd7a28 Merge branch '111-unique-name-control-conf' into 'dev' Anton Romanov 2019-05-13 19:20:44 +0000
58a8495835 Merge remote-tracking branch 'remotes/origin/dev' into 103-autotest-conf #217 Nightblade73 2019-05-13 20:27:52 +0400
ab59cb524e #103 fix code style Nightblade73 2019-05-13 20:26:13 +0400
1f8722e3ff #103 code refactoring Nightblade73 2019-05-13 20:13:53 +0400
6044d6f8e3 #111 save method refactor #213 Nightblade73 2019-05-13 19:08:21 +0400
395cf57cc1 #44 finish with papers T-Midnight 2019-05-13 16:29:33 +0400
a3afdeb988 Merge branch '123-student-task-timeline' into 'dev' Anton Romanov 2019-05-13 07:15:57 +0000
aaa21d591d Merge branch '121-reduce-paper-title' into 'dev' Anton Romanov 2019-05-13 06:54:49 +0000
48d7131593 gl_88 inviting user gl_88 arefiev1997 2019-05-13 03:16:37 +0400
c612e35ad9 #44 add check for papers T-Midnight 2019-05-12 23:27:19 +0400
9abcf7792e Merge branch 'lk' into gl_88 arefiev1997 2019-05-12 23:07:59 +0400
9c53257729 fixed lk page arefiev1997 2019-05-12 22:26:50 +0400
f6830d499b #121 update view #216 T-Midnight 2019-05-12 15:31:50 +0400
99ec7af319 #121 reduce paper title T-Midnight 2019-05-12 15:30:09 +0400
e1907d3169 #121 change Paper to PaperDto in attaching papers T-Midnight 2019-05-12 15:28:47 +0400
451e7e5d04 #103 fix code style Nightblade73 2019-05-12 13:50:46 +0400
5cbbb6c319 #103 fix code style Nightblade73 2019-05-12 13:49:49 +0400
70062992ae #103 clear code Nightblade73 2019-05-12 13:45:17 +0400
fe53c86136 #103 fixed delete conf test Nightblade73 2019-05-12 13:42:50 +0400
5b4180e685 #123 fixing layout #218 ASH 2019-05-12 11:04:43 +0400
a11e10dec4 #123 adding task timeline ASH 2019-05-12 01:00:26 +0400
d846192046 #111 fixes Nightblade73 2019-05-12 00:28:03 +0400
7798508d4f Merge branch 'dev' into 79-students-tags-generation ASH 2019-05-11 23:26:21 +0400
c59bb45c70 #79 fixing codestyle ASH 2019-05-11 23:06:30 +0400
0de34c89fe #79 fixing planner and year generation ASH 2019-05-11 22:58:57 +0400
ed8855272f lk base arefiev1997 2019-05-11 22:06:31 +0400
b2e8a43cee #103 delete conf test Nightblade73 2019-05-11 00:51:57 +0400
3f32a61ed2 Merge remote-tracking branch 'origin/103-autotest-conf' into 103-autotest-conf Nightblade73 2019-05-10 23:38:54 +0400
6edcf8f594 #103 add sort and filter test, fixed delete conference, if it has fk with event Nightblade73 2019-05-10 21:15:49 +0400
4686406954 #103 add undock article Nightblade73 2019-05-10 21:15:49 +0400
4e4e7ae194 #103 add paper transition Nightblade73 2019-05-10 20:54:43 +0400
cad8682088 #103 add adding article Nightblade73 2019-05-10 20:07:55 +0400
d9a4224317 #103 add attach article Nightblade73 2019-05-10 19:15:22 +0400
7b4318a3b5 #103 add delete deadline Nightblade73 2019-05-10 17:40:24 +0400
0cb7b05c25 #103 add check take part Nightblade73 2019-05-10 17:21:36 +0400
253f4b4aad #103 add check new deadline Nightblade73 2019-05-10 17:03:47 +0400
1ad66d6fb1 #103 change name method test Nightblade73 2019-05-10 15:54:12 +0400
961fdf9397 #70 added conference class, added create method test Nightblade73 2019-05-10 15:07:47 +0400