nikita
|
78d7ee0de6
|
Merge remote-tracking branch 'origin/master' into feature/lil-580
# Conflicts:
# apps/school/templates/school/livelesson_detail.html
|
8 years ago |
Ivlev Denis
|
1258a695c8
|
LIL-575. Effective amount from payment provider
(cherry picked from commit 5393d61)
|
8 years ago |
|
cfwme
|
43d8c29add
|
Merge branch 'feature/lil-593' into 'master'
LIL-593 Доработать логику работы платежей
See merge request lilcity/backend!103
|
8 years ago |
|
cfwme
|
14a2b9e221
|
Merge branch 'hotfix/lil-588' into 'master'
Hotfix/lil 588
See merge request lilcity/backend!91
|
8 years ago |
|
nikita
|
1d1f516f0e
|
category fix
|
8 years ago |
gzbender
|
54ae82dd95
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/lil-580
|
8 years ago |
|
gzbender
|
455aad5a25
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-588
|
8 years ago |
|
cfwme
|
916deaea6a
|
Merge branch 'hotfix/lil-595' into 'master'
Hotfix/lil 595
See merge request lilcity/backend!74
|
8 years ago |
|
cfwme
|
12c243d60e
|
Merge branch 'hotfix/lil-600' into 'master'
lil-600 fix
See merge request lilcity/backend!100
|
8 years ago |
|
gzbender
|
2984d33073
|
lil-600 fix
|
8 years ago |
|
cfwme
|
bac475d398
|
Merge branch 'hotfix/LIL-615' into 'master'
LIL-615 fix
See merge request lilcity/backend!98
|
8 years ago |
|
gzbender
|
9c047e2a4d
|
LIL-615 fix
|
8 years ago |
|
cfwme
|
2a84a5c48f
|
Merge branch 'hotfix/LIL-615' into 'master'
LIL-615 Поменять ссылки, которые содержат кириллицу
See merge request lilcity/backend!93
|
8 years ago |
|
cfwme
|
740337c010
|
Merge branch 'hotfix/lil-600' into 'master'
LIL-600 Игнорировать заглавные буквы в email; refactoring
See merge request lilcity/backend!97
|
8 years ago |
|
gzbender
|
19739c1dce
|
LIL-600 Игнорировать заглавные буквы в email; refactoring
|
8 years ago |
|
cfwme
|
c35637161d
|
Merge branch 'hotfix/lil-600' into 'master'
Hotfix/lil 600
See merge request lilcity/backend!96
|
8 years ago |
|
gzbender
|
9f7cb66438
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-600
|
8 years ago |
|
gzbender
|
d6eccc2087
|
lil-600, case insensitive auth backend
|
8 years ago |
|
cfwme
|
3d342c094c
|
Merge branch 'feature/LIL-614' into 'master'
LIL-614 Добавить логотип партнера
See merge request lilcity/backend!94
|
8 years ago |
|
cfwme
|
80d5286e01
|
Merge branch 'hotfix/LIL-585' into 'master'
LIL-585 Добавить текст
See merge request lilcity/backend!92
|
8 years ago |
|
cfwme
|
e20f3c0d77
|
Merge branch 'hotfix/lil-576' into 'master'
LIL-576 Поправить верстку
See merge request lilcity/backend!89
|
8 years ago |
|
gzbender
|
4e1ef7982f
|
LIL-614 Добавить логотип партнера
|
8 years ago |
|
gzbender
|
7775208dbe
|
LIL-615 Поменять ссылки, которые содержат кириллицу
|
8 years ago |
|
gzbender
|
1b93afb991
|
LIL-585 Добавить текст
|
8 years ago |
|
gzbender
|
32e426631a
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-576
|
8 years ago |
|
cfwme
|
272cc5f743
|
Merge branch 'hotfix/lil-600' into 'master'
LIL-600 Игнорировать заглавные буквы в email
See merge request lilcity/backend!86
|
8 years ago |
|
cfwme
|
a8ba0ebaf5
|
Merge branch 'hotfix/lil-610' into 'master'
LIL-610 Функция Ответить на коммент не работает в уроке
See merge request lilcity/backend!88
|
8 years ago |
|
gzbender
|
b1439eeaec
|
LIL-610 Функция Ответить на коммент не работает в уроке
|
8 years ago |
|
cfwme
|
84b4850702
|
Merge branch 'hotfix/lil-609' into 'master'
LIL-609 Некорректное время в комментария
See merge request lilcity/backend!87
|
8 years ago |
|
gzbender
|
30e1784b29
|
LIL-600 Игнорировать заглавные буквы в email
|
8 years ago |
|
gzbender
|
e6d138a374
|
LIL-609 Некорректное время в комментария
|
8 years ago |
|
cfwme
|
7661ed11ad
|
Merge branch 'hotfix/lil-608' into 'master'
LIL-608 В лагере на 1 августа есть лишний урок, надо его удалить
See merge request lilcity/backend!85
|
8 years ago |
|
gzbender
|
da8fea0082
|
LIL-608 В лагере на 1 августа есть лишний урок, надо его удалить
|
8 years ago |
|
cfwme
|
9a24a1e02d
|
Merge branch 'hotfix/lil-607' into 'master'
LIL 607
See merge request lilcity/backend!84
|
8 years ago |
|
gzbender
|
db0acf1c40
|
LIL 607
|
8 years ago |
|
cfwme
|
beb44efadc
|
Merge branch 'hotfix/lil-606' into 'master'
Hotfix/lil 606
See merge request lilcity/backend!82
|
8 years ago |
|
cfwme
|
999cc68bc4
|
Merge branch 'hotfix/lil-607' into 'master'
Hotfix/lil 607
See merge request lilcity/backend!83
|
8 years ago |
|
gzbender
|
8b5954c3f2
|
LIL-607 popup
|
8 years ago |
|
gzbender
|
22f314637b
|
LIL-607 Доступ к вкладке уроки работает неправильно
|
8 years ago |
|
gzbender
|
91452a43ff
|
Lil 606
|
8 years ago |
|
gzbender
|
7bed1f3a49
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-606
|
8 years ago |
|
gzbender
|
83919037b9
|
LIL-606 Обычный пользователь видит вкладку Опубликованные курсы
|
8 years ago |
|
nikita
|
f90bc9d8ed
|
Promo off
|
8 years ago |
|
cfwme
|
ec2348ca12
|
Merge branch 'hotfix/lil-603' into 'master'
Hotfix/lil 603
See merge request lilcity/backend!81
|
8 years ago |
|
gzbender
|
f9b4308bf5
|
Fix LIL-603
|
8 years ago |
|
gzbender
|
e408194bad
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/lil-603
|
8 years ago |
|
gzbender
|
8e714a9eb7
|
LIL-606 Обычный пользователь видит вкладку Опубликованные курсы
|
8 years ago |
|
gzbender
|
20c041abc3
|
Fix LIL-603
|
8 years ago |
|
cfwme
|
89165ffbda
|
Merge branch 'hotfix/lil-603' into 'master'
LIL-603 Закрыть возможность купить лагерь с 31.07
See merge request lilcity/backend!80
|
8 years ago |
|
gzbender
|
0c71c73172
|
LIL-603 Закрыть возможность купить лагерь с 31.07
|
8 years ago |
