gzbender
|
981b5f4751
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-523
|
8 years ago |
cfwme
|
89939df53c
|
Merge branch 'hotfix/lil-467' into 'master'
Hotfix/lil 467
See merge request lilcity/backend!63
|
8 years ago |
|
cfwme
|
34070d0cc9
|
Merge branch 'roistat' into 'master'
Roistat
See merge request lilcity/backend!62
|
8 years ago |
Ivlev Denis
|
918d70272a
|
fix
|
8 years ago |
|
Ivlev Denis
|
d377668b52
|
LIL-563. Add roistat visit to transaction_to_roistat
|
8 years ago |
|
Ivlev Denis
|
7782042377
|
LIL-563. Add roistat visit field to payment
|
8 years ago |
Mikhail Lavkin
|
cd97b688f8
|
Merge branch 'ci-get-prod-db' into 'master'
Ci get prod db
See merge request lilcity/backend!61
|
8 years ago |
|
Mikhail Lavkin
|
961f9ac950
|
Ci get prod db
|
8 years ago |
|
nikita
|
b56dbec434
|
main page fixes
|
8 years ago |
|
nikita
|
6ef802f463
|
Merge remote-tracking branch 'origin/dev' into master_latest
|
8 years ago |
|
Ivlev Denis
|
bfbc5eda6e
|
Fix time on main page
|
8 years ago |
|
cfwme
|
6c52f8bbed
|
Merge branch 'hotfix-datetime' into 'master'
main page fix
See merge request lilcity/backend!60
|
8 years ago |
|
nikita
|
4c8ca6f758
|
main page fix
|
8 years ago |
|
cfwme
|
43bfd29782
|
Merge branch 'dev' into 'master'
Roistat & dev docker & fix roistat counter
See merge request lilcity/backend!58
|
8 years ago |
|
nikita
|
cb98082328
|
Merge remote-tracking branch 'origin/master' into dev2
# Conflicts:
# project/templates/blocks/promo.html
# project/templates/lilcity/index.html
|
8 years ago |
root
|
72e13d0623
|
Merge branch 'review'
|
8 years ago |
|
root
|
3d8bf5bde6
|
review
|
8 years ago |
|
root
|
4d19fc5bce
|
review
|
8 years ago |
|
nikita
|
698ffa34d8
|
today mainpage hardcode
|
8 years ago |
|
root
|
55a6aff12f
|
Merge branch 'review' of gitlab.com:lilcity/backend into review
|
8 years ago |
|
root
|
7a8fcbf082
|
review
|
8 years ago |
|
nikita
|
aa20afb2cf
|
roistat checking fix
|
8 years ago |
|
nikita
|
c64f61b5a0
|
roistat checking fix
|
8 years ago |
|
nikita
|
4be21776df
|
test
|
8 years ago |
|
Ivlev Denis
|
fbbb59b975
|
LIL-536. Update static version dynamically
|
8 years ago |
|
gzbender
|
2d20b14733
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-467
|
8 years ago |
|
gzbender
|
7a931aadcd
|
LIL-467 Сделать значение по умолчанию пустой строкой, а не '0'
|
8 years ago |
|
nikita
|
9d3f86cede
|
Улучшение отображение контента, если урок еще не создан
|
8 years ago |
|
nikita
|
399a7ba53e
|
Убрать лишнюю кнопку «Перейти к оплате»
|
8 years ago |
|
nikita
|
7000f2456c
|
Убрать лишнюю кнопку «Перейти к оплате»
|
8 years ago |
|
nikita
|
0d0652463f
|
Показывать смотреть урок только для заполненных курсов
Показывать дату урока
|
8 years ago |
|
nikita
|
88c863b2d2
|
Показывать смотреть урок только для заполненных курсов
Показывать дату урока
(cherry picked from commit bef9ba5)
|
8 years ago |
|
gzbender
|
97b7a8bd23
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-523
|
8 years ago |
|
gzbender
|
ae0160fc9c
|
LIL-523 Реализовать возможность перестановки списка уроков при создании курса
|
8 years ago |
|
root
|
817a6110c0
|
review
|
8 years ago |
|
root
|
654d6c7cd6
|
review
|
8 years ago |
|
root
|
ed2ed3fe44
|
review
|
8 years ago |
|
root
|
ad9eec2154
|
review
|
8 years ago |
|
root
|
06830f6c63
|
review
|
8 years ago |
|
nikita
|
dceed7010b
|
is_online period changed
|
8 years ago |
|
nikita
|
a70e97d43a
|
is_online period changed
|
8 years ago |
|
nikita
|
811051f7c5
|
playsinline revert
|
8 years ago |
|
nikita
|
07be83fe06
|
live video autoplay
|
8 years ago |
|
nikita
|
2a6cd9c58b
|
access hotfix
|
8 years ago |
|
nikita
|
f995da9f1c
|
?playsinline=0 option
|
8 years ago |
|
Ivlev Denis
|
257b3aa8ab
|
LIL-557. Add coming soon button
|
8 years ago |
|
nikita
|
c448520b0b
|
Показывать кнопку Смотреть Урок для заполненного урока
|
8 years ago |
|
nikita
|
a1ca1b4772
|
Показывать кнопку Смотреть Урок для заполненного урока
|
8 years ago |
|
nikita
|
0d0b9a4eb0
|
Убрана Пролонгация
Хардкод сегодняшнего урока на главной
|
8 years ago |
|
cfwme
|
13f333fc2d
|
Merge branch 'hotfix/lil-545' into 'master'
LIL-545 баг с версткой
See merge request lilcity/backend!57
|
8 years ago |
