Commit Graph

90 Commits

Author SHA1 Message Date
alex
8f899905ec years for award types 2020-02-04 17:19:09 +03:00
Anatoly
400b5ac402 change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random 2020-02-03 17:16:40 +03:00
Kuroshini
dd1b241c41 verbose award_type for API 2020-01-23 18:26:09 +03:00
dormantman
18978355bc Change method model 2020-01-23 13:56:17 +03:00
dormantman
6a1fea76b6 Added content page method 2020-01-22 16:03:23 +03:00
Anatoly
6e61587b27 refactor admin panel, remove unused field from model NavBarPermission 2020-01-15 23:19:17 +03:00
Anatoly
fedf1400fd add M2M site feature relations to NavBarPermission model 2020-01-15 22:45:58 +03:00
Kuroshini
42885e8b4c International carousel 2020-01-15 13:45:22 +03:00
Anatoly
32ad122d9a set priority in Feature model as blank, and remove uniqueness constrait 2020-01-15 13:22:54 +03:00
Anatoly
6541070d1c Merge branch 'develop' into feature/navigation-bar
# Conflicts:
#	apps/main/serializers.py
2020-01-14 19:06:59 +03:00
Anatoly
5c95c4923f refactored roles, refactored response for User detail view 2020-01-14 18:40:30 +03:00
Dmitriy Kuzmenko
11b55e9f4c change chosen tag functional 2020-01-14 15:40:49 +03:00
alex
989e9f9465 last country 2020-01-10 15:57:36 +03:00
Semyon Yekhmenin
28331e5274 Implemented filtering carousel entries by country code when country code specified and international carousel when not 2019-12-23 14:39:45 +00:00
Dmitriy Kuzmenko
f010c97433 add export for panel 2019-12-22 20:33:51 +03:00
Dmitriy Kuzmenko
847412bb2f Merge branch 'develop' into panels
# Conflicts:
#	apps/main/admin.py
2019-12-19 19:09:49 +03:00
Dmitriy Kuzmenko
a1f06fd0b9 panels executor 2019-12-19 19:07:23 +03:00
Kuroshini
bfd8044b47 remove must_of_the_week field 2019-12-19 16:48:50 +03:00
Kuroshini
53387886cd must of the week 2019-12-17 23:13:57 +03:00
Kuroshini
f0585b3ebc fix carousel slugs 2019-12-17 18:37:51 +03:00
alex
d29a46c1a5 news by_locale 2019-12-17 15:13:16 +03:00
Dmitriy Kuzmenko
b03cd4fe09 add transfer command, models and crud api. 2019-12-12 15:37:42 +03:00
Anatoly
fb5a9d4302 refactored ads 2019-12-11 12:26:32 +03:00
Dmitriy Kuzmenko
6af7a7da5b add footer migrations and api 2019-12-09 17:47:37 +03:00
Виктор Гладких
62b7befda7 SiteFeatures migrate 2019-11-26 15:45:11 +03:00
Виктор Гладких
ee781150fd Site settings 2019-11-22 10:38:03 +03:00
alex
7ba3913000 award filter 2019-11-20 16:17:49 +03:00
Anatoly
1dbd7a6451 refactored advertisements 2019-11-15 13:02:04 +03:00
d.kuzmenko
995d55302a Merge branch 'feature/nested-published-features' into 'develop'
Feature/nested published features

See merge request gm/gm-backend!112
2019-11-12 11:57:20 +00:00
Dmitriy Kuzmenko
359deeeb39 fix model currency 2019-11-12 04:06:28 +03:00
Kuroshini
c1f89515c5 Nested sitefeatures for new design 2019-11-07 18:08:29 +03:00
d.kuzmenko
b5789a1a5e Merge branch 'feature/affilations/award_type' into 'develop'
Feature/affilations/award type

See merge request gm/gm-backend!104
2019-11-06 09:00:51 +00:00
Виктор Гладких
0ab60c1852 Add awards 2019-11-06 11:40:07 +03:00
Виктор Гладких
3e3d7a21db Add award types 2019-11-06 10:23:31 +03:00
Kuroshini
70f86c792b New email templates 2019-11-05 21:33:38 +03:00
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
Dmitriy Kuzmenko
c50cd7c693 add migrations 2019-11-03 16:51:17 +03:00
Dmitriy Kuzmenko
689dca4ea1 add migrations 2019-11-03 16:45:22 +03:00
Dmitriy Kuzmenko
c47f659657 add fix currency 2019-11-03 15:34:53 +03:00
evgeniy-st
4f67c295d1 Carousel link 2019-11-02 12:11:03 +03:00
evgeniy-st
dcea8b2a69 small fix 2019-11-02 12:05:18 +03:00
evgeniy-st
11d06b7b97 update Carousel model_name 2019-11-02 12:00:09 +03:00
Dmitriy Kuzmenko
0d7187e330 change get image in carusel 2019-11-01 18:20:48 +03:00
Dmitriy Kuzmenko
660eb347c5 add filter by country for carusel 2019-11-01 18:10:12 +03:00
alex
aab76d219f Merge remote-tracking branch 'origin/develop' into develop 2019-11-01 17:38:09 +03:00
alex
7acc8592a8 country for carousel 2019-11-01 17:37:53 +03:00
Dmitriy Kuzmenko
effe468777 add active to carusel 2019-11-01 16:56:37 +03:00
evgeniy-st
42cd311dc4 Carousel is parsed 2019-11-01 15:12:35 +03:00
alex
68182e837c carousel fin 2019-11-01 08:41:56 +03:00
alex
3c88d4f1f5 carousel serializer 2019-10-31 18:31:15 +03:00