Marat
|
addab8bf41
|
Add new file
|
8 years ago |
Andrey
|
b8bb1f8f75
|
Merge branch 'dev' into 'master'
readme update
See merge request !2
|
8 years ago |
|
Andrey
|
65635e247f
|
readme update
|
8 years ago |
|
Andrey
|
cceb44fa3d
|
master
|
8 years ago |
|
Andrey
|
886ac99fb5
|
master
|
8 years ago |
|
Andrey
|
f236e4a472
|
Merge branch 'master' into new_lms_migrate
|
8 years ago |
|
Andrey
|
f043f57d38
|
update user command
|
8 years ago |
|
Andrey
|
caf229f221
|
update user api
|
8 years ago |
|
Andrey
|
7b56bf0d50
|
update user api
|
8 years ago |
|
Marat
|
543eff28ea
|
Add new file
|
8 years ago |
|
Andrey
|
fdeed92ab6
|
update api прохождения
|
8 years ago |
|
Andrey
|
404d6da093
|
update api прохождения
|
8 years ago |
|
Andrey
|
a9dd7e71ad
|
update api прохождения
|
8 years ago |
|
Andrey
|
32ab1e8764
|
update api прохождения
|
8 years ago |
|
Andrey
|
35d477e279
|
update api прохождения
|
8 years ago |
|
Andrey
|
b912260ade
|
update api прохождения
|
8 years ago |
|
Andrey
|
b11f269c27
|
update api прохождения
|
8 years ago |
|
Andrey
|
048c99b8c7
|
update api прохождения
|
8 years ago |
|
Andrey
|
534b66dab9
|
update api прохождения
|
8 years ago |
|
Andrey
|
6064eee301
|
update api прохождения
|
8 years ago |
|
Andrey
|
e574d88215
|
update api прохождения
|
8 years ago |
|
Andrey
|
f9bc093cdb
|
update api прохождения
|
8 years ago |
|
Andrey
|
28813344a1
|
update api
|
8 years ago |
|
Andrey
|
22af0ce19b
|
update api
|
8 years ago |
|
Andrey
|
005c962ae3
|
update api
|
8 years ago |
|
Andrey
|
5c2a9d33cc
|
update api
|
8 years ago |
|
Andrey
|
deb0c6142c
|
отладка процесса прохождения
|
8 years ago |
|
Andrey
|
56fa371de7
|
устранение проблем с мёржем
|
8 years ago |
|
Andrey
|
c54f9bfc39
|
Merge remote-tracking branch 'origin/new_lms_dev(critical)' into new_lms_dev(critical)
# Conflicts:
# access/views.py
|
8 years ago |
|
Andrey
|
3549a29daf
|
fix
|
8 years ago |
|
Andrey
|
a541f879c2
|
Merge branch 'new_lms_dev' into 'new_lms_dev(critical)'
# Conflicts:
# access/views.py
|
8 years ago |
|
Andrey
|
c03d805cd9
|
Merge branch 'new_lms_dev__refactor' into 'new_lms_dev'
Вынес прогресс пользователя в отдельное приложение
See merge request skillbox/go.skillbox.ru!87
|
8 years ago |
Evgeniy Shabanov
|
3826ac2037
|
Fix
|
8 years ago |
Zolotarev Alexander
|
73dc004a3b
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!86
|
8 years ago |
|
Zolotarev Alexander
|
0807a90962
|
Merge branch 'hot_fix_jl' into 'develop'
Hot fix jl
See merge request skillbox/go.skillbox.ru!85
|
8 years ago |
|
Andrey
|
57c24a71eb
|
fix
|
8 years ago |
|
Andrey
|
6926b4c694
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
Andrey
|
6a2ff47daa
|
fix
|
8 years ago |
|
Zolotarev Alexander
|
8d8349cd51
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!84
|
8 years ago |
|
Evgeniy Shabanov
|
8d695f1d18
|
Merge branch 'new_lms_dev' into new_lms_dev__refactor
# Conflicts:
# access/admin.py
# access/models/__init__.py
# access/models/other.py
# access/serializers.py
# access/urls.py
# access/views.py
# csv/load_bills.py
# csv/load_perm.py
|
8 years ago |
|
Evgeniy Shabanov
|
2344b88cb2
|
Вынес прогресс пользователя в отдельное приложение
|
8 years ago |
|
Andrey
|
44c2ac6c3b
|
Merge branch 'new_lms_dev(critical)' into 'new_lms_dev'
fix
See merge request skillbox/go.skillbox.ru!83
|
8 years ago |
|
Andrey
|
07e254df8a
|
fix
|
8 years ago |
|
Zolotarev Alexander
|
da758a4142
|
Merge branch 'develop_homework_get_next' into 'develop'
Получение следующего материала после д/з
See merge request skillbox/go.skillbox.ru!80
|
8 years ago |
|
Andrey
|
ede34d9290
|
Merge branch 'new_lms_dev(critical)' into 'new_lms_dev'
fix
See merge request skillbox/go.skillbox.ru!82
|
8 years ago |
|
Andrey
|
ee519ac50f
|
fix
|
8 years ago |
|
Andrey
|
535f822b64
|
Merge branch 'new_lms_dev(critical)' into 'new_lms_dev'
New lms dev(critical)
See merge request skillbox/go.skillbox.ru!81
|
8 years ago |
|
Andrey
|
486f19023e
|
fix
|
8 years ago |
|
Evgeniy Shabanov
|
7628425ec2
|
Получение следующего материала после д/з
|
8 years ago |
|
Zolotarev Alexander
|
814375ee2c
|
Merge branch 'develop_task_265' into 'develop'
Изменение процедуры формирования карты после сохранения урока/дз/экзамена
See merge request skillbox/go.skillbox.ru!77
|
8 years ago |
