gzbender
|
74dec82c1f
|
LIL-593 Доработать логику работы платежей
|
8 years ago |
nikita
|
e43e890114
|
LIL-589 linebreaks
|
8 years ago |
|
nikita
|
5844d2877a
|
LIL-589 linebreak
|
8 years ago |
|
cfwme
|
5d1b94942a
|
Merge branch 'hotfix/LIL-560' into 'master'
Fix LIL-560
See merge request lilcity/backend!79
|
8 years ago |
|
gzbender
|
1c20b3c328
|
Fix LIL-560
|
8 years ago |
|
cfwme
|
f0db9c214c
|
Merge branch 'hotfix/lil-597' into 'master'
Hotfix/lil 597
See merge request lilcity/backend!78
|
8 years ago |
|
gzbender
|
bfebaf369c
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-597
|
8 years ago |
|
gzbender
|
a4c9fc608c
|
fix in LIL-597 Показывать записи уроков за всё время
|
8 years ago |
|
cfwme
|
6443d80619
|
Merge branch 'hotfix/LIL-560' into 'master'
Hotfix/lil 560
See merge request lilcity/backend!77
|
8 years ago |
|
gzbender
|
43ed449269
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/LIL-560
|
8 years ago |
|
cfwme
|
d4c6b525b8
|
Merge branch 'hotfix/lil-597' into 'master'
LIL-597 Показывать записи уроков за всё время
See merge request lilcity/backend!76
|
8 years ago |
|
gzbender
|
55bb4bb70c
|
LIL-597 Показывать записи уроков за всё время
|
8 years ago |
|
cfwme
|
d55406d635
|
Merge branch 'revert-70535700' into 'master'
Revert "Merge branch 'hotfix/lil-597' into 'master'"
See merge request lilcity/backend!75
|
8 years ago |
|
cfwme
|
404c48c9b3
|
Revert "Merge branch 'hotfix/lil-597' into 'master'"
This reverts merge request !73
|
8 years ago |
|
cfwme
|
7053570013
|
Merge branch 'hotfix/lil-597' into 'master'
LIL-597 Показывать записи уроков за всё время
See merge request lilcity/backend!73
|
8 years ago |
|
gzbender
|
90f5eebcb7
|
LIL-597 Показывать записи уроков за всё время
|
8 years ago |
Ivlev Denis
|
b110eaad87
|
LIL-596. Fix non paid schedule template
(cherry picked from commit 6760feb)
|
8 years ago |
|
gzbender
|
cb809cb8fa
|
LIL-560 Кнопку «Смотреть урок» поднять выше
|
8 years ago |
|
cfwme
|
a0a4b0b059
|
Merge branch 'hotfix/lil-572' into 'master'
LIL-572 Незарегистрированный пользователь не видит курсы
See merge request lilcity/backend!70
|
8 years ago |
|
cfwme
|
659f80b23f
|
Merge branch 'hotfix/lil-574' into 'master'
LIL-574 Добавить сумма/месяц
See merge request lilcity/backend!69
|
8 years ago |
|
cfwme
|
ea58aadb0e
|
Merge branch 'hotfix/LIL-560' into 'master'
LIL-560 Кнопку «Смотреть урок» поднять выше
See merge request lilcity/backend!68
|
8 years ago |
|
gzbender
|
e5e5a06583
|
LIL-574 Добавить сумма/месяц
|
8 years ago |
|
gzbender
|
c36f68300a
|
LIL-572 Незарегистрированный пользователь не видит курсы
|
8 years ago |
|
gzbender
|
fae11c2d4f
|
LIL-560 Кнопку «Смотреть урок» поднять выше
|
8 years ago |
|
nikita
|
d1d8d4bccd
|
Фикс покупок для летнего лагеря
|
8 years ago |
|
nikita
|
3776d53464
|
Review env debug on
|
8 years ago |
|
cfwme
|
04e523c493
|
Merge branch 'hotfix/LIL-560' into 'master'
LIL-560 Кнопку «Смотреть урок» поднять выше
See merge request lilcity/backend!66
|
8 years ago |
|
gzbender
|
8d47365cf8
|
LIL-560 Кнопку «Смотреть урок» поднять выше
|
8 years ago |
|
nikita
|
1a3a595cd2
|
Teacher role fix
|
8 years ago |
|
nikita
|
c3b49276d9
|
text fix
|
8 years ago |
|
cfwme
|
e733858c88
|
Merge branch 'feature/LIL-523' into 'master'
Feature/lil 523
See merge request lilcity/backend!64
|
8 years ago |
|
nikita
|
5a01145ea9
|
Add google, yandex snippets
|
8 years ago |
|
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 |
