Andrey
|
843a22f8bf
|
Merge branch 'dev' into 'master'
Dev
See merge request !479
|
8 years ago |
|
Andrey
|
41834719c8
|
Merge branch 'file_upload' into 'dev'
File upload
See merge request !478
|
8 years ago |
|
Andrey
|
729bc81d87
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
d90394e306
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
4f8c2a56c3
|
Merge branch 'dev' into 'master'
Dev
See merge request !477
|
8 years ago |
|
Andrey
|
a83e5eeec3
|
Merge branch 'file_upload' into 'dev'
Выставляется препод к курсу
See merge request !476
|
8 years ago |
|
Andrey
|
7dd6aafdcc
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
1ff4b14992
|
Merge branch 'dev' into 'master'
Dev
See merge request !475
|
8 years ago |
|
Andrey
|
76bb4888d9
|
Merge branch 'file_upload' into 'dev'
Выставляется препод к курсу
See merge request !474
|
8 years ago |
|
Andrey
|
7beb19d686
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
79234fe1e6
|
Merge branch 'dev' into 'master'
Dev
See merge request !473
|
8 years ago |
|
Andrey
|
f4df15e6a0
|
Merge branch 'comment_fix' into 'dev'
Выставляется препод к курсу
See merge request !472
|
8 years ago |
|
Andrey
|
992a30f6fc
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
51804d83dc
|
Merge branch 'dev' into 'master'
Dev
See merge request !471
|
8 years ago |
|
Andrey
|
9c904fced6
|
Merge branch 'sales_fix' into 'dev'
Sales fix
See merge request !470
|
8 years ago |
|
Andrey
|
9e5f28060e
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
42432cf9f7
|
Выставляется препод к курсу
|
8 years ago |
Marat
|
13fce76ea3
|
Merge branch 'autodeploy' into 'master'
Update Envoy.blade.php
See merge request !469
|
8 years ago |
|
Marat
|
0ec3ba041a
|
Merge branch 'autodeploy' into 'dev'
Update Envoy.blade.php
See merge request !468
|
8 years ago |
|
Marat
|
44464c060b
|
Update Envoy.blade.php
|
8 years ago |
|
Andrey
|
b79070bd43
|
Merge branch 'teacher_hot_fix' into 'dev'
Выставляется препод к курсу
See merge request !467
|
8 years ago |
|
Andrey
|
ff270c2fbb
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
26fe5fb97b
|
Merge branch 'teacher_hot_fix' into 'dev'
Teacher hot fix
See merge request !466
|
8 years ago |
|
Andrey
|
b382383743
|
Выставляется препод к курсу
|
8 years ago |
|
Andrey
|
488f29588c
|
Merge remote-tracking branch 'origin/key_field' into key_field
|
8 years ago |
|
Andrey
|
adac2a9061
|
можно приписывать ключ для матчинга к платежам
|
8 years ago |
|
Andrey
|
741793ceeb
|
Merge branch 'dev' into 'master'
Dev
See merge request !465
|
8 years ago |
|
Andrey
|
e2d3e419da
|
Merge branch 'key_field' into 'dev'
можно приписывать ключ для матчинга к платежам
See merge request !464
|
8 years ago |
|
Andrey
|
f380e094c9
|
Merge branch 'dev' into 'key_field'
# Conflicts:
# finance/views.py
|
8 years ago |
|
Andrey
|
6d943fc50e
|
можно приписывать ключ для матчинга к платежам
|
8 years ago |
|
Marat
|
3f341ccfb8
|
Merge branch 'autodeploy' into 'dev'
Autodeploy
See merge request !463
|
8 years ago |
|
Marat
|
dc919e555e
|
Update .gitlab-ci.yml
|
8 years ago |
|
Marat
|
698aafee5a
|
Update Envoy.blade.php
|
8 years ago |
|
Andrey
|
3265e8199a
|
Merge branch 'dev' into 'master'
Dev
See merge request !461
|
8 years ago |
|
Andrey
|
8cc2000f26
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !460
|
8 years ago |
|
Andrey
|
b1fd168302
|
stat part 1
|
8 years ago |
|
Andrey
|
44ce01ad59
|
Merge branch 'dev' into 'master'
Dev
See merge request !459
|
8 years ago |
|
Andrey
|
fdc4683ca2
|
Merge branch 'statistics_migrate' into 'dev'
Statistics migrate
See merge request !458
|
8 years ago |
|
Andrey
|
f16185e229
|
stat part 1
|
8 years ago |
|
Andrey
|
7c29dd4ed4
|
stat part 1
|
8 years ago |
|
Andrey
|
24122e750a
|
Merge branch 'dev' into 'master'
Dev
See merge request !457
|
8 years ago |
|
Andrey
|
05ba1e8a82
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !456
|
8 years ago |
|
Andrey
|
bd022d080d
|
stat part 1
|
8 years ago |
|
Andrey
|
94621e3a42
|
Merge branch 'dev' into 'master'
Dev
See merge request !455
|
8 years ago |
|
Andrey
|
0f361a1ad9
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !454
|
8 years ago |
|
Andrey
|
eeac7645a1
|
stat part 1
|
8 years ago |
|
Andrey
|
c2900a6eb0
|
Merge branch 'dev' into 'master'
Dev
See merge request !453
|
8 years ago |
|
Andrey
|
bd0d988a27
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !452
|
8 years ago |
|
Andrey
|
e29224c128
|
stat part 1
|
8 years ago |
|
Andrey
|
8981e66f48
|
Merge branch 'dev' into 'master'
Dev
See merge request !451
|
8 years ago |
