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
|
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
|
a808a9f9ba
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
Andrey
|
48fec74b8d
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
Andrey
|
a0a04acf15
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
8 years ago |
Andrey
|
d0427df6ae
|
Merge remote-tracking branch 'origin/fix_req' into fix_req
# Conflicts:
# requirements.txt
|
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 |
Andrey
|
60ce64d46f
|
Merge branch 'current_branch' into 'dev'
Current branch
See merge request !100
|
8 years ago |
Andrey
|
3a0b2020f9
|
migrate update
|
8 years ago |
Andrey
|
3fab7048d0
|
migrate update
|
8 years ago |
Andrey
|
02091ab08b
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !98
|
8 years ago |
Andrey
|
54cde7d395
|
migrate update
|
8 years ago |
Andrey
|
883cd8707a
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !96
|
8 years ago |
Andrey
|
a3fba6fff4
|
migrate update
|
8 years ago |
Andrey
|
84f19a9031
|
Merge branch 'current_branch' into 'dev'
Current branch
See merge request !94
|
8 years ago |
Andrey
|
a6072dc424
|
migrate update
|
8 years ago |
Dmitriy Shesterkin
|
6ca8139a68
|
merge from dev
|
8 years ago |
Dmitriy Shesterkin
|
7911b37fa2
|
add swagger
|
8 years ago |
Andrey
|
3e8ac38769
|
migrate update
|
8 years ago |
Andrey
|
6502ac527b
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !92
|
8 years ago |
Andrey
|
7c38338f59
|
migrate update
|
8 years ago |
Andrey
|
0f6860e24b
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !90
|
8 years ago |
Andrey
|
c4725d8dfa
|
migrate update
|
8 years ago |
Andrey
|
9fc559f6b2
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !88
|
8 years ago |
Andrey
|
f26a210003
|
migrate update
|
8 years ago |
Andrey
|
cdce83b3bf
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !86
|
8 years ago |
Andrey
|
ce1f65a189
|
migrate update
|
8 years ago |
Andrey
|
0d51eda880
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !84
|
8 years ago |
Andrey
|
e529e011cd
|
migrate update
|
8 years ago |
Andrey
|
53c28845d4
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !82
|
8 years ago |
Andrey
|
128ed49f3a
|
migrate update
|
8 years ago |
Andrey
|
41a632314d
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !80
|
8 years ago |
Andrey
|
b5b2a746f7
|
migrate update
|
8 years ago |
Andrey
|
26976b46ca
|
Merge branch 'current_branch' into 'dev'
migrate update
See merge request !78
|
8 years ago |