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
|
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 |
|
Andrey
|
fe6a0a9281
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !450
|
8 years ago |
|
Andrey
|
bfd4be4d2f
|
stat part 1
|
8 years ago |
|
Andrey
|
efbe234f56
|
Merge branch 'dev' into 'master'
Dev
See merge request !449
|
8 years ago |
|
Andrey
|
c491edc5d6
|
Merge branch 'statistics_migrate' into 'dev'
Statistics migrate
See merge request !448
|
8 years ago |
|
Andrey
|
982982ceec
|
stat part 1
|
8 years ago |
|
Andrey
|
4a832878a0
|
stat part 1
|
8 years ago |
|
Andrey
|
21e1c63dd6
|
Merge branch 'dev' into 'master'
Dev
See merge request !447
|
8 years ago |
|
Andrey
|
6d133a8f7f
|
Merge branch 'statistics_migrate' into 'dev'
Statistics migrate
See merge request !446
|
8 years ago |
|
Andrey
|
88e96b81a8
|
stat part 1
|
8 years ago |
|
Andrey
|
84d227a8a2
|
stat part 1
|
8 years ago |
|
Andrey
|
b1909ce963
|
stat part 1
|
8 years ago |
|
Andrey
|
21f2646b48
|
Merge branch 'dev' into 'master'
Dev
See merge request !445
|
8 years ago |
|
Andrey
|
630724d110
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !444
|
8 years ago |
|
Andrey
|
f03051ae75
|
stat part 1
|
8 years ago |
|
Andrey
|
0d943e277b
|
Merge branch 'dev' into 'master'
Dev
See merge request !443
|
8 years ago |
|
Andrey
|
2e2840c526
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !442
|
8 years ago |
|
Andrey
|
f2f3a1e29a
|
stat part 1
|
8 years ago |
|
Andrey
|
c514a7f31e
|
Merge branch 'dev' into 'master'
Dev
See merge request !441
|
8 years ago |
|
Andrey
|
1ab64c434c
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !440
|
8 years ago |
|
Andrey
|
d24f35f6b0
|
stat part 1
|
8 years ago |
|
Andrey
|
cbb746e670
|
Merge branch 'dev' into 'master'
Dev
See merge request !439
|
8 years ago |
|
Andrey
|
54c3a85ee0
|
Merge branch 'statistics_migrate' into 'dev'
stat part 1
See merge request !438
|
8 years ago |
|
Andrey
|
6a4a5d64d5
|
stat part 1
|
8 years ago |
