Commit Graph

161 Commits

Author SHA1 Message Date
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
Dmitriy Kuzmenko
02d0112d8b add export for guides 2019-12-26 18:11:48 +03:00
alex
18d6c10120 footer links 2019-12-24 10:29:48 +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
Виктор Гладких
31fa1dacce Add qs to SiteFeatures views 2019-12-23 14:54:42 +03:00
Dmitriy Kuzmenko
f010c97433 add export for panel 2019-12-22 20:33:51 +03:00
Dmitriy Kuzmenko
71fb3249b0 add chenge to panel admin 2019-12-20 10:02:59 +03:00
Dmitriy Kuzmenko
93c9daf6c4 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-12-20 10:01:33 +03:00
Dmitriy Kuzmenko
f69d7d6e71 add chenge to panel admin 2019-12-20 10:01:22 +03:00
Kuroshini
2b117ba0f5 fix typo 2019-12-20 01:23:21 +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
alex
4b563989a1 country_code in determine-location 2019-12-18 17:46:42 +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
evgeniy-st
8a7b583154 added country_name to endpoint 'determine-location' 2019-12-17 16:49:56 +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
Kuroshini
39c8f6d152 remove carousel hardcode 2019-12-11 15:47:08 +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
Dmitriy Kuzmenko
831cb4bc81 add home_page 2019-12-06 18:17:16 +03:00
Виктор Гладких
7cf34f0741 fix 2019-12-03 18:30:33 +03:00
Виктор Гладких
fdc63f2677 Add API methods for site-feature 2019-12-03 10:20:13 +03:00
Виктор Гладких
e02db4958a Add feature serializer 2019-12-02 17:40:01 +03:00
Виктор Гладких
a72deaec37 Site site settings 2019-12-02 17:24:51 +03:00
Kuroshini
aebdb0fb20 Add id field to api/web/main/site-settings/{domain} 2019-11-29 15:50:42 +03:00
Anatoly
5660c20d50 added id field to site BO serializers 2019-11-28 18:52:57 +03:00
Anatoly
41611c5b9b added sites to back office endpoints 2019-11-28 18:37:12 +03:00
alex
c81dbf2d8e main back test 2019-11-28 15:29:42 +03:00
alex
5a3093be51 content type get api 2019-11-28 15:19:13 +03:00
Виктор Гладких
62b7befda7 SiteFeatures migrate 2019-11-26 15:45:11 +03:00
Dmitriy Kuzmenko
193a7ae29d Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-22 18:34:01 +03:00
Dmitriy Kuzmenko
c83c07b9e1 add site features inline admin 2019-11-22 18:33:39 +03:00
evgeniy-st
f95a082db3 update geoip feature 2019-11-22 16:00:06 +03:00
Виктор Гладких
3a1e55ba1f Site settings migrate data 2019-11-22 10:58:07 +03:00
Виктор Гладких
ee781150fd Site settings 2019-11-22 10:38:03 +03:00
Kuroshini
8e215b2555 Demonstration carousel item 2019-11-21 16:40:53 +03:00
alex
cad0f8df0a award test 2019-11-21 09:11:52 +03:00
alex
824cbe203b award back api 2019-11-20 16:38:11 +03:00
alex
7ba3913000 award filter 2019-11-20 16:17:49 +03:00
Anatoly
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
Anatoly
d0fec2591f added bo endpoints for ads 2019-11-18 12:48:39 +03:00
Kuroshini
798e58202c Return hardcode for chosen tags 2019-11-15 15:53:26 +03:00
a.feteleu
277fe8d17e fixed SiteFeatureSerializer 2019-11-15 13:43:32 +03:00
Anatoly
1dbd7a6451 refactored advertisements 2019-11-15 13:02:04 +03:00