gzbender
|
65bbde0ede
|
lil-583
|
7 years ago |
|
gzbender
|
ba3f95362e
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/lil-583
|
7 years ago |
cfwme
|
fcb6a5032c
|
Merge branch 'feature/LIL-643' into 'master'
LIL-643 Добавить онлайн-чат
See merge request lilcity/backend!132
|
7 years ago |
|
gzbender
|
5a398418fd
|
LIL-643 Добавить онлайн-чат
|
7 years ago |
|
nikita
|
909d9ab0d0
|
fullscreen video fix
|
7 years ago |
|
nikita
|
b5f8febba4
|
Hide contest work upload button
|
7 years ago |
|
cfwme
|
97ae40a95f
|
Merge branch 'hotfix/LIL-642' into 'master'
LIL-642
See merge request lilcity/backend!131
|
7 years ago |
|
gzbender
|
d2712b3b38
|
LIL-642
|
7 years ago |
|
cfwme
|
9abc51df92
|
Merge branch 'hotfix/LIL-642' into 'master'
LIL-642 Не учитывать голоса удаленных пользователей (is_active false) в конкурсе
See merge request lilcity/backend!130
|
7 years ago |
|
gzbender
|
f2ec7ebb7e
|
LIL-642
|
7 years ago |
|
gzbender
|
66a0fef6bb
|
LIL-642 Не учитывать голоса удаленных пользователей (is_active false) в конкурсе
|
7 years ago |
|
cfwme
|
2cab36e8df
|
Merge branch 'feature/LIL-638' into 'master'
LIL-638
See merge request lilcity/backend!129
|
7 years ago |
|
gzbender
|
1cc670ba6e
|
LIL-638
|
7 years ago |
|
cfwme
|
8afed017df
|
Merge branch 'feature/LIL-638' into 'master'
Feature/lil 638
See merge request lilcity/backend!127
|
7 years ago |
|
gzbender
|
2ff4263254
|
LIL-638
|
7 years ago |
|
cfwme
|
9822189c16
|
Merge branch 'hotfix/LIL-634' into 'master'
LIL-634 Маленький размер фрейма Вимео
See merge request lilcity/backend!126
|
7 years ago |
|
gzbender
|
d19d07359c
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into hotfix/LIL-634
|
7 years ago |
|
gzbender
|
ceea053465
|
LIL-634 Маленький размер фрейма Вимео
|
7 years ago |
|
cfwme
|
dd563eb081
|
Merge branch 'feature/LIL-638' into 'master'
LIL-638 Добавить кнопки на пробный урок в другие места на сайте
See merge request lilcity/backend!125
|
7 years ago |
|
gzbender
|
eb87e295ad
|
LIL-638 Добавить кнопки на пробный урок в другие места на сайте
|
7 years ago |
|
cfwme
|
da1966a111
|
Merge branch 'hotfix/LIL-637' into 'master'
LIL-637 Админка. Урок Персонаж невозможно отредактировать
See merge request lilcity/backend!124
|
7 years ago |
|
gzbender
|
c5e9c905bf
|
LIL-637 Админка. Урок Персонаж невозможно отредактировать
|
7 years ago |
|
cfwme
|
29b6184595
|
Merge branch 'feature/LIL-635' into 'master'
LIL-635 вставить иконки в школу
See merge request lilcity/backend!123
|
7 years ago |
|
nikita
|
6767ce67d9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
nikita
|
479c41d205
|
Не показывать комменты удаленного автора
|
7 years ago |
|
gzbender
|
2b8c9d553e
|
LIL-635 вставить иконки в школу
|
7 years ago |
|
cfwme
|
34962e7ea9
|
Merge branch 'feature/LIL-618' into 'master'
LIL-618 Добавить промокоды партнеров на главную
See merge request lilcity/backend!122
|
8 years ago |
|
gzbender
|
6f193c97eb
|
LIL-618 Добавить промокоды партнеров на главную
|
8 years ago |
|
cfwme
|
25b18ba7f2
|
Merge branch 'feature/LIL-623' into 'master'
LIL-623 добавить пробный урок у преподавателя
See merge request lilcity/backend!121
|
8 years ago |
|
gzbender
|
89a60f0046
|
LIL-623 добавить пробный урок у преподавателя
|
8 years ago |
|
cfwme
|
d10b301e43
|
Merge branch 'hotfix/LIL-629' into 'master'
LIL-629 Попап с выбором дней перед покупкой показывать не авторизованным
See merge request lilcity/backend!120
|
8 years ago |
|
gzbender
|
49413fbe3b
|
LIL-629
|
8 years ago |
|
nikita
|
2a967311a3
|
Typo fix
|
8 years ago |
|
nikita
|
58f71cb4d4
|
Mainpage fixes
|
8 years ago |
|
gzbender
|
2bc26ee02b
|
LIL-629 Попап с выбором дней перед покупкой показывать не авторизованным
|
8 years ago |
|
gzbender
|
837e81dac6
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/lil-583
|
8 years ago |
|
cfwme
|
191d2886cd
|
Merge branch 'hotfix/LIL-622' into 'master'
Hotfix/lil 622
See merge request lilcity/backend!119
|
8 years ago |
|
nikita
|
2727a8bd8d
|
Button fix
|
8 years ago |
|
nikita
|
17826fe2c2
|
Link tiny fix
|
8 years ago |
|
cfwme
|
f23929572c
|
Merge branch 'hotfix/LIL-622' into 'master'
Hotfix/lil 622
See merge request lilcity/backend!117
|
8 years ago |
|
gzbender
|
355748ae66
|
LIL-622
|
8 years ago |
|
nikita
|
4562666c07
|
Text fixes
|
8 years ago |
|
gzbender
|
5a7e534cfa
|
Merge branch 'hotfix/LIL-628' of https://gitlab.com/lilcity/backend into hotfix/LIL-622
|
8 years ago |
|
gzbender
|
2ab73b029e
|
LIL-622
|
8 years ago |
|
gzbender
|
6e142ff693
|
LIL-622
|
8 years ago |
|
cfwme
|
8a918d77db
|
Merge branch 'hotfix/LIL-619' into 'master'
LIL-619 Выводить превью, а не оригиналы для обложек уроков
See merge request lilcity/backend!115
|
8 years ago |
|
cfwme
|
ed32a08543
|
Merge branch 'feature/LIL-582' into 'master'
Feature/lil 582
See merge request lilcity/backend!118
|
8 years ago |
|
gzbender
|
4312b61e3b
|
LIL-622
|
8 years ago |
|
gzbender
|
3183339605
|
LIL-622
|
8 years ago |
|
gzbender
|
c3c0e0a5b5
|
LIL-622
|
8 years ago |
