gzbender
|
7425023fea
|
LIL-622 Открыть школу для покупки уроков.
|
8 years ago |
cfwme
|
bd26578ecb
|
Merge branch 'feature/LIL-582' into 'master'
Feature/lil 582
See merge request lilcity/backend!113
|
8 years ago |
|
gzbender
|
a0fe075aaf
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-582
|
8 years ago |
|
gzbender
|
baff2e9e86
|
LIL-582
|
8 years ago |
|
cfwme
|
a82a10627b
|
Merge branch 'feature/LIL-582' into 'master'
LIL-582
See merge request lilcity/backend!112
|
8 years ago |
|
gzbender
|
8e08dd04b7
|
LIL-582
|
8 years ago |
|
cfwme
|
8dfb871976
|
Merge branch 'feature/LIL-582' into 'master'
Feature/lil 582
See merge request lilcity/backend!111
|
8 years ago |
|
gzbender
|
31f0b7a702
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-582
|
8 years ago |
|
gzbender
|
17a3347a88
|
LIL-582 thumbnails, ip save in likes and etc
|
8 years ago |
|
gzbender
|
353980c79e
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-582
|
8 years ago |
|
gzbender
|
a3ccc10809
|
LIL-582 contest link in header
|
8 years ago |
|
nikita
|
dc129dc6d1
|
Contest start
|
8 years ago |
|
cfwme
|
43b84fc1c3
|
Merge branch 'feature/LIL-582' into 'master'
LIL-582
See merge request lilcity/backend!109
|
8 years ago |
|
gzbender
|
fa1d33a41a
|
LIL-582
|
8 years ago |
|
cfwme
|
d4c1225d39
|
Merge branch 'feature/LIL-582' into 'master'
LIL-582 load work button double
See merge request lilcity/backend!108
|
8 years ago |
|
gzbender
|
1aaf111408
|
LIL-582 load work button double
|
8 years ago |
|
cfwme
|
d30741751b
|
Merge branch 'feature/LIL-582' into 'master'
LIL-582 links in redactor
See merge request lilcity/backend!107
|
8 years ago |
|
gzbender
|
16ef85d42a
|
LIL-582 links in redactor
|
8 years ago |
|
cfwme
|
8065f303ad
|
Merge branch 'feature/LIL-582' into 'master'
Feature/lil 582
See merge request lilcity/backend!106
|
8 years ago |
|
gzbender
|
a5523e8bf3
|
LIL-582
|
8 years ago |
|
gzbender
|
4da1f1dcd8
|
LIL-582 fixes for prod
|
8 years ago |
|
cfwme
|
08b25bfd7c
|
Merge branch 'feature/LIL-582' into 'master'
Feature/lil 582
See merge request lilcity/backend!105
|
8 years ago |
|
gzbender
|
e24142ff0e
|
LIL-582 hide contest link in menu
|
8 years ago |
|
gzbender
|
37f8d4b2f4
|
LIL-582, comments
|
8 years ago |
|
gzbender
|
d5f825603b
|
LIL-582
|
8 years ago |
|
gzbender
|
18a138db6b
|
LIL-582
|
8 years ago |
|
gzbender
|
291fe68821
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-582
|
8 years ago |
|
gzbender
|
4c97c791d8
|
LIL-582, contest works autoload on scroll, check that user uploaded work and etc
|
8 years ago |
root
|
1b1d84f058
|
CI enviroment fix
(cherry picked from commit 39c965e283)
|
8 years ago |
|
gzbender
|
e2671221cb
|
Merge branch 'master' of https://gitlab.com/lilcity/backend into feature/LIL-582
|
8 years ago |
|
gzbender
|
604e2c16f6
|
LIL-582
|
8 years ago |
|
gzbender
|
6630ec34ee
|
LIL-582
|
8 years ago |
|
gzbender
|
876cefab66
|
LIL-582
|
8 years ago |
|
gzbender
|
0ad60238a9
|
LIL-582 Конкурс
|
8 years ago |
|
cfwme
|
95e10e0c07
|
Merge branch 'feature/lil-580' into 'master'
Feature/lil 580
See merge request lilcity/backend!90
|
8 years ago |
|
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 |
