Andrey
|
9f50307d14
|
fix
|
8 years ago |
|
Andrey
|
496e053e0d
|
fix
|
8 years ago |
|
Andrey
|
ce187a2147
|
Merge branch 'current_branch' into 'dev'
fix
See merge request !128
|
8 years ago |
|
Andrey
|
0c79de15f6
|
Merge branch 'dev' into 'current_branch'
# Conflicts:
# access/views.py
|
8 years ago |
|
Andrey
|
31b14cc293
|
fix
|
8 years ago |
|
Andrey
|
f7b0551d09
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !127
|
8 years ago |
|
Andrey
|
b98b46239a
|
fix
|
8 years ago |
|
Andrey
|
b13a716def
|
Merge branch 'fix_push' into 'dev'
Fix push
See merge request !125
|
8 years ago |
|
Andrey
|
0a65021bb6
|
fix
|
8 years ago |
|
Andrey
|
4c4f65da46
|
fix
|
8 years ago |
|
Andrey
|
958e06a084
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !124
|
8 years ago |
|
Andrey
|
e9b157c387
|
fix
|
8 years ago |
|
Andrey
|
c5a0356352
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !123
|
8 years ago |
|
Andrey
|
8a0f50504a
|
fix
|
8 years ago |
|
Andrey
|
ee664523d3
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !122
|
8 years ago |
|
Andrey
|
1fcb8d2eb0
|
fix
|
8 years ago |
|
Andrey
|
b3838ce297
|
Merge branch 'fix_push' into 'dev'
fix
See merge request !121
|
8 years ago |
|
Andrey
|
01dd3e9715
|
fix
|
8 years ago |
|
Andrey
|
b3e290a89a
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !120
|
8 years ago |
|
Andrey
|
e7f2936ded
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
61b2726004
|
Merge branch 'fix_push' into 'dev'
Fix push
See merge request !119
|
8 years ago |
|
Andrey
|
68fdd77e07
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
ea39c1815d
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
a2e180b28c
|
Merge branch 'fix_push' into 'dev'
Fix push
See merge request !118
|
8 years ago |
|
Andrey
|
7b28e891c0
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
326820d94f
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
dbda0b4bec
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !115
|
8 years ago |
|
Andrey
|
a808a9f9ba
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
a14960e31f
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !114
|
8 years ago |
|
Andrey
|
48fec74b8d
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
d01a3d2c69
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !112
|
8 years ago |
|
Andrey
|
a0a04acf15
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
f2dc1b94c5
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !111
|
8 years ago |
|
Andrey
|
d0427df6ae
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
5562c4676c
|
Merge branch 'fix_push' into 'dev'
Merge remote-tracking branch 'origin/fix_req' into fix_req
See merge request !110
|
8 years ago |
|
Andrey
|
6947459387
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
|
Andrey
|
90fb2ecce2
|
Merge branch 'fix_req' into 'dev'
migrate update
See merge request !109
|
8 years ago |
|
Andrey
|
cfa90e96a1
|
Merge branch 'dev' into 'fix_req'
# Conflicts:
# Envoy.blade.php
|
8 years ago |
|
Andrey
|
2e71a82823
|
migrate update
|
8 years ago |
|
Andrey
|
2377d16635
|
Merge branch 'feature/test_course' into 'dev'
Feature/test course
See merge request !108
|
8 years ago |
 Dmitriy Shesterkin
|
005f27efdc
|
add test for generate password for not active user, delete dublicate code
|
8 years ago |
|
Dmitriy Shesterkin
|
95fa0a2600
|
add test generate password by manager with wrong data
|
8 years ago |
|
Dmitriy Shesterkin
|
b7b0a6fac6
|
Merge branch 'dev' into feature/test_course
|
8 years ago |
|
Dmitriy Shesterkin
|
b92e6d0435
|
add method for generate new password to students
|
8 years ago |
|
Andrey
|
47f5ffaeef
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !106
|
8 years ago |
|
Andrey
|
7765ebef40
|
migrate update
|
8 years ago |
|
Andrey
|
cfeefccf44
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !104
|
8 years ago |
|
Andrey
|
4bfcefd701
|
migrate update
|
8 years ago |
|
Andrey
|
3525bdfad3
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !102
|
8 years ago |
|
Andrey
|
0e2cdfcb90
|
migrate update
|
8 years ago |
