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 |
|
Zolotarev Alexander
|
4005e008ca
|
Merge branch 'develop' into 'master'
Develop
See merge request !36
|
9 years ago |
|
Zolotarev Alexander
|
27c847c820
|
Merge branch 'hotfix/flows' into 'develop'
fix to flows
See merge request !35
|
9 years ago |
|
Alexander Zolotarev
|
cd6bc0b850
|
fix to flows
|
9 years ago |
|
Zolotarev Alexander
|
8ac7e06109
|
Merge branch 'feature/new-management-cabinet' into 'develop'
Feature/new management cabinet
See merge request !33
|
9 years ago |
|
Zolotarev Alexander
|
a038dcc675
|
Merge branch 'hotfix/correct-paths-to-image' into 'develop'
Hotfix/correct paths to image
See merge request !32
|
9 years ago |
|
Mikhail Bortnikov
|
e643636436
|
новая оферта
|
9 years ago |
|
Mikhail Bortnikov
|
4ed8826bf7
|
добавил отображение курсов
|
9 years ago |
|
Mikhail Bortnikov
|
205e774ef8
|
путь в настройках
|
9 years ago |
|
Zolotarev Alexander
|
fdab6e6db2
|
Merge branch 'feature/oferta' into 'develop'
Feature/oferta
See merge request !31
|
9 years ago |
|
Mikhail Bortnikov
|
ff722c2548
|
шаблон кабинета
|
9 years ago |
|
Mikhail Bortnikov
|
3234cb0f04
|
поправил выбор тем + проверка роли
|
9 years ago |
|
Mikhail Bortnikov
|
0d8be120ce
|
убрал урл + поправил кабинет
|
9 years ago |
|
Mikhail Bortnikov
|
5205422e61
|
формы
|
9 years ago |
|
Mikhail Bortnikov
|
b1e7ee29cd
|
файл оферты
|
9 years ago |
|
Mikhail Bortnikov
|
1d076335b8
|
поправил настройки
|
9 years ago |
|
Mikhail Bortnikov
|
7645b505cb
|
поправил настройки
|
9 years ago |
|
Mikhail Bortnikov
|
92c79237ba
|
переместил вьюху в правильное место
|
9 years ago |
|
Mikhail Bortnikov
|
925a054450
|
вынес путь в настройки
|
9 years ago |
|
Mikhail Bortnikov
|
4e71cb108f
|
открытие дипломов файлом
|
9 years ago |
|
Zolotarev Alexander
|
b888708a51
|
Update .gitlab-ci.yml
|
9 years ago |
|
Zolotarev Alexander
|
48cd548578
|
Merge branch 'hotfix/hotfix-10.07' into 'develop'
Hotfix/hotfix 10.07
See merge request !30
|
9 years ago |
|
Mikhail Bortnikov
|
13b94cc627
|
Добавил работу с темами
|
9 years ago |
|
Mikhail Bortnikov
|
25d748810c
|
открытие домашек и уроков
|
9 years ago |
|
Mikhail Bortnikov
|
d8851e4199
|
Поправил путь до файлов
|
9 years ago |
|
Mikhail Bortnikov
|
9e68f87240
|
Логика работы галочки
|
9 years ago |
|
Mikhail Bortnikov
|
24721e78d2
|
Добавил договор оферты
|
9 years ago |
|
Mikhail Bortnikov
|
af41ee6563
|
Проверка первого урока + счета с потоками
|
9 years ago |
|
Mikhail Bortnikov
|
046b654bbf
|
Убрал проверку галочки в курсе
|
9 years ago |
|
Mikhail Bortnikov
|
8865d431fb
|
убрал не нужное теперь поле в моделе
|
9 years ago |
|
Mikhail Bortnikov
|
21ba623e41
|
Поменял проверку уроков
|
9 years ago |
|
Mikhail Bortnikov
|
635f72afeb
|
Теперь знаем когда спадает галочка
|
9 years ago |
|
Mikhail Bortnikov
|
747dd0883f
|
Убрал поиск прошлого урока
|
9 years ago |
|
Mikhail Bortnikov
|
7b3cbe1dbb
|
Вернул открытие домашек в дипломных
|
9 years ago |
|
Zolotarev Alexander
|
8e86868543
|
Merge branch 'develop' into 'master'
Develop
See merge request !29
|
9 years ago |
|
Zolotarev Alexander
|
3fab516f77
|
Merge branch 'hotfix/spam-requests' into 'develop'
Hotfix/spam requests
See merge request !26
|
9 years ago |
|
Zolotarev Alexander
|
b43b3867ad
|
Merge branch 'hotfix/new-telephones' into 'develop'
Добавил телефоны + изменил верстку
See merge request !25
|
9 years ago |
|
Zolotarev Alexander
|
712e4682df
|
Merge branch 'feature/flows' into 'develop'
Feature/flows
See merge request !28
|
9 years ago |
Павел Матвеев
|
b6bda592a5
|
Merge branch 'hotfix/fix-request-21' into 'develop'
обращение к методу класса
See merge request !27
|
9 years ago |
