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 |
|
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 |
|
Zolotarev Alexander
|
cd5eb4efb1
|
Merge branch 'middleware_fix' into 'develop'
Middleware fix
See merge request !55
|
8 years ago |
|
Andrey
|
1910b05a95
|
Новое поле в новой модельке
|
8 years ago |
|
Andrey
|
394e2b7881
|
Убрал некоторые ограничения прав. Это нужно выкатить, как можно быстрее
|
8 years ago |
|
Andrey
|
24adcd2927
|
в процессе
|
8 years ago |
|
Andrey
|
d1759a5fe4
|
Описание в readme
|
8 years ago |
|
Andrey
|
7fd5d662eb
|
Подготовка api
|
8 years ago |
|
Andrey
|
e3e14ebd21
|
в процессе
|
8 years ago |
|
Andrey
|
870a7afe00
|
в процессе
|
8 years ago |
|
Alexander Zolotarev
|
701407f98a
|
remove media folder
|
8 years ago |
|
Zolotarev Alexander
|
3e4ca8155e
|
Merge branch 'develop' into 'master'
Develop
See merge request !53
|
8 years ago |
|
Zolotarev Alexander
|
c6a61fb0b0
|
Merge branch 'feature-statystics' into 'develop'
Feature statystics
See merge request !51
|
8 years ago |
|
Zolotarev Alexander
|
bb45c618c8
|
Merge branch 'hotfix-homework-500-error' into 'develop'
bag_fix
See merge request !50
|
8 years ago |
|
Zolotarev Alexander
|
ee70816d34
|
Merge branch 'perm_feature' into 'develop'
Perm feature
See merge request !48
|
8 years ago |
|
andrey
|
9cf631aa5b
|
Добавил djangorestframework в проект (для построения api)
|
8 years ago |
|
andrey
|
882954901c
|
исправленны пути в media
|
8 years ago |
|
andrey
|
a0a04af617
|
Внесены правки в выборку данных
|
8 years ago |
|
andrey
|
d9adc2da54
|
итоговая версия
|
8 years ago |
|
andrey
|
2856764163
|
нет времени объяснять
|
8 years ago |
|
andrey
|
76ef758f4e
|
Вернул хост для бд на место изменил длину строк
|
8 years ago |
|
andrey
|
266fa6ae5d
|
Вернул хост для бд на место
|
8 years ago |
|
andrey
|
0a9b55cbde
|
Фикс разметки
|
8 years ago |
|
andrey
|
bd4df55233
|
Явная проверка существования директории media дерриктории media
|
8 years ago |
|
andrey
|
2eeaeb215d
|
Исправление стилистики кода удаление не функцианальных частей
|
9 years ago |
|
andrey
|
5a2ca903c0
|
Исправление стилистики кода удаление не функцианальных частей
|
9 years ago |
|
andrey
|
e2968fd60f
|
Исправление стилистики кода удаление не функцианальных частей
|
9 years ago |
|
Andrey
|
8fe3db08d3
|
Merge branch 'feature-statystics' into 'develop'
Feature statystics
See merge request !49
|
9 years ago |
|
andrey
|
ef07207fde
|
perm middleware
|
9 years ago |
|
andrey
|
0e3ee1b5dd
|
bag_fix
|
9 years ago |
|
andrey
|
3bcea5dfff
|
bag_fix
|
9 years ago |
|
Zolotarev Alexander
|
a3ec1a12a4
|
Merge branch 'develop' into 'master'
Develop
See merge request !43
|
9 years ago |
|
Zolotarev Alexander
|
a8a7589d4a
|
Merge branch 'feature/new-management-cabinet' into 'develop'
поправил расположение блока
See merge request !37
|
9 years ago |
|
Alexander Zolotarev
|
a89b69f9f0
|
replace oferta file
|
9 years ago |
|
Zolotarev Alexander
|
36150c6562
|
Merge branch 'hotfix/fix_migration' into 'develop'
fix migration
See merge request !41
|
9 years ago |
|
Zolotarev Alexander
|
2dfef41ce1
|
Merge branch 'hotfix/fix_migration' into 'master'
fix migration
See merge request !42
|
9 years ago |
|
Alexander Zolotarev
|
0181688bf7
|
fix migration
|
9 years ago |
|
Zolotarev Alexander
|
1903fd804f
|
Merge branch 'develop' into 'master'
Develop
See merge request !40
|
9 years ago |
|
Alexander Zolotarev
|
e0c3aa6de1
|
Merge branch 'hotfix/new-oferta' into develop
|
9 years ago |
|
Zolotarev Alexander
|
b3d4d8fb1b
|
Merge branch 'hotfix/fix_open_lesson' into 'develop'
fix open lesson
See merge request !38
|
9 years ago |
|
Zolotarev Alexander
|
d976d9f0ae
|
Merge branch 'hotfix/fix_open_lesson' into 'master'
fix open lesson
See merge request !39
|
9 years ago |
|
Alexander Zolotarev
|
5c2c163438
|
fix open lesson
|
9 years ago |
Mikhail Bortnikov
|
5d920d8480
|
поправил расположение блока
|
9 years ago |
