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 |
|
Zolotarev Alexander
|
da758a4142
|
Merge branch 'develop_homework_get_next' into 'develop'
Получение следующего материала после д/з
See merge request skillbox/go.skillbox.ru!80
|
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 |
|
Evgeniy Shabanov
|
105038f402
|
Изменение процедуры формирования карты после сохранения урока/дз/экзамена
|
8 years ago |
|
Zolotarev Alexander
|
f6ecbdedf6
|
Merge branch 'template_small_fix' into 'develop'
Template small fix
See merge request skillbox/go.skillbox.ru!70
|
8 years ago |
|
Andrey
|
0bf0e130e0
|
create map
|
8 years ago |
|
Zolotarev Alexander
|
8eba2933c8
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!69
|
8 years ago |
|
Zolotarev Alexander
|
7afa2963a1
|
Merge branch 'lesson_hot_fix' into 'develop'
lesson_fix
See merge request skillbox/go.skillbox.ru!68
|
8 years ago |
|
Andrey
|
bb006ebe21
|
lesson_fix
|
8 years ago |
|
Andrey
|
668d97de25
|
lesson_fix
|
8 years ago |
|
Andrey
|
f6d83e5f48
|
lesson_fix
|
8 years ago |
|
Andrey
|
46d2adb1c8
|
lesson_fix
|
8 years ago |
Alexander Zolotarev
|
354cb9ab8c
|
new sertificate for ssl
|
8 years ago |
|
Zolotarev Alexander
|
e585d5b94d
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!67
|
8 years ago |
|
Zolotarev Alexander
|
d3b9ec7ff1
|
Merge branch 'fix_articles_comments' into 'develop'
Убрал комменты из под статей
See merge request skillbox/go.skillbox.ru!66
|
8 years ago |
|
Andrey
|
b6fc9861f3
|
Убрал комменты из под статей
|
8 years ago |
|
Zolotarev Alexander
|
4d29e18037
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!65
|
8 years ago |
|
Zolotarev Alexander
|
bfceb4c9e5
|
Merge branch 'fix_prices' into 'develop'
Fix prices
See merge request skillbox/go.skillbox.ru!64
|
8 years ago |
|
Andrey
|
3a211e1f4b
|
Убрал цены
|
8 years ago |
|
Zolotarev Alexander
|
7ce3a6a97c
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!63
|
8 years ago |
|
Zolotarev Alexander
|
d0a3ab6320
|
Merge branch 'yandex_fix' into 'develop'
Параметры для яндекс кассы
See merge request skillbox/go.skillbox.ru!62
|
8 years ago |
|
Andrey
|
2d3ddd4e8a
|
Пораметры для яндекс касы
|
8 years ago |
|
Zolotarev Alexander
|
c8d8260438
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!61
|
8 years ago |
|
Zolotarev Alexander
|
f1e0da5db1
|
Merge branch 'prices_feture' into 'develop'
Prices feture
See merge request skillbox/go.skillbox.ru!60
|
8 years ago |
|
Andrey
|
15a75ce78d
|
Нужно добавить csv в папку статики
|
8 years ago |
|
Zolotarev Alexander
|
fefaa503eb
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!59
|
8 years ago |
|
Zolotarev Alexander
|
e4835fe3f7
|
Merge branch 'hotfix_contacts' into 'develop'
Изменил контактную информацию и договор оферты, нужно принять как можно скорее
See merge request skillbox/go.skillbox.ru!58
|
8 years ago |
|
Andrey
|
23d6efaaef
|
Изменил контактную информацию и договор оферты, нужно принять как можно скорее
|
8 years ago |
|
Zolotarev Alexander
|
943d89b3dc
|
Merge branch 'fix_user_serializer' into 'develop'
Fix user serializer
See merge request skillbox/go.skillbox.ru!57
|
8 years ago |
|
Andrey
|
aa4023ef39
|
в процессе
|
8 years ago |
|
Andrey
|
17d4a45516
|
Исправил опечатку
|
8 years ago |
|
Andrey
|
eef99fb5d1
|
добавил api для регистрации и авторизации
|
8 years ago |
|
Andrey
|
89f872f98c
|
в процессе
|
8 years ago |
|
Andrey
|
29d695fa78
|
в процессе
|
8 years ago |
|
Andrey
|
bed98e30b0
|
Изменение api юзера
|
8 years ago |
|
Alexander Zolotarev
|
fe94a55f13
|
new migrations files
|
8 years ago |
|
Zolotarev Alexander
|
c6430ebc4f
|
Merge branch 'develop' into 'master'
Develop
See merge request skillbox/go.skillbox.ru!56
|
8 years ago |
|
Alexander Zolotarev
|
54b0e4f45e
|
edit req
|
8 years ago |
|
Zolotarev Alexander
|
e2b07beacb
|
Merge branch 'drf_install' into 'develop'
Добавил djangorestframework в проект (для построения api)
See merge request skillbox/go.skillbox.ru!52
|
8 years ago |
|
Andrey
|
23290cd612
|
в процессе
|
8 years ago |
|
Zolotarev Alexander
|
0a2cd35c15
|
Merge branch 'tree_view_refactor' into 'develop'
Tree view refactor
See merge request !54
|
8 years ago |
|
Andrey
|
88bae0e8dc
|
Добавленно пользовательское api
|
8 years ago |
|
Andrey
|
7e90f2c1d8
|
Немного новых вьюх
|
8 years ago |
|
Andrey
|
62d65aef6a
|
Немного новых фич в api
|
8 years ago |
|
Andrey
|
f54f3149f5
|
Merge remote-tracking branch 'origin/tree_view_refactor' into tree_view_refactor
|
8 years ago |
|
Andrey
|
9ea4b9e822
|
Поправил файл настроек
|
8 years ago |
|
Andrey
|
317aee959b
|
Merge branch 'develop' into 'tree_view_refactor'
# Conflicts:
# access/middleware.py
|
8 years ago |
