Commit Graph

1969 Commits

Author SHA1 Message Date
Виктор Гладких
6bb0eac409 Fix establishment timetable serailizer for permission 2019-11-25 10:45:20 +03:00
Виктор Гладких
13eb8abac6 fix country or site 2019-11-25 09:49:17 +03:00
alex
49e5e4ea91 test establishment and news carousel 2019-11-25 09:38:50 +03:00
Виктор Гладких
58db94e2d0 Permission 2019-11-25 09:33:22 +03:00
Anatoly
9b61ff3114 added COOKIE_DOMAIN parameter to settings 2019-11-23 14:58:49 +03:00
Anatoly
d9743d8465 refactored serializer 2019-11-22 22:48:26 +03:00
Dmitriy Kuzmenko
4fdc32ea04 Merge branch 'feature/crop-params' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/crop-params 2019-11-22 19:21:28 +03:00
Dmitriy Kuzmenko
797327802b Merge remote-tracking branch 'origin/develop' into feature/crop-params 2019-11-22 19:21:16 +03:00
Anatoly
65bb22bb21 reassign sorl-thumbnail engine 2019-11-22 19:04:47 +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
Kuroshini
586f2a7a03 boost detail establishment speed
(cherry picked from commit c2bb9f0)
2019-11-22 18:22:41 +03:00
Kuroshini
c2bb9f0814 boost detail establishment speed 2019-11-22 18:21:37 +03:00
d.kuzmenko
39b9b2b7e9 Merge branch 'feature/bo_employee_update' into 'develop'
Feature/bo employee update

See merge request gm/gm-backend!119
2019-11-22 14:21:25 +00:00
Semyon Yekhmenin
e565406729 Feature/bo employee update 2019-11-22 14:21:25 +00:00
alex
a5d5dc1335 establishment carousel web and mobile api 2019-11-22 17:13:41 +03:00
alex
fa183bfc92 carousel back api url 2019-11-22 17:00:43 +03:00
alex
7e878956e3 carousel api for news 2019-11-22 16:22:31 +03:00
evgeniy-st
99f01464b7 Merge branch 'develop' into feature/crop-params 2019-11-22 16:08:42 +03:00
Виктор Гладких
e3420d571e Contentpage permission in news 2019-11-22 16:05:02 +03:00
Виктор Гладких
376c8cdff3 State test news with contentpage permission 2019-11-22 16:00:59 +03:00
evgeniy-st
f95a082db3 update geoip feature 2019-11-22 16:00:06 +03:00
Виктор Гладких
e0352b7d93 Back news permissions 2019-11-22 15:46:59 +03:00
alex
429825804a create destroy mixin 2019-11-22 15:07:50 +03:00
Kuroshini
64ac1d2578 Merge branch 'develop' into feature/crop-params 2019-11-22 14:47:16 +03:00
Anatoly
844c8525e9 refactored, add endpoint - /api/back/gallery/<pk>/crop/ 2019-11-22 14:46:45 +03:00
Олег Хаятов
801f5fce24 Merge branch 'feature/back_news_serializer_fix' into 'develop'
Changed in_favorites field to read only

See merge request gm/gm-backend!147
2019-11-22 11:46:24 +00:00
Semyon Yekhmenin
120e686be6 Changed in_favorites field to read only 2019-11-22 11:46:24 +00:00
Kuroshini
0231f97709 Establishment facet visibble tags only
(cherry picked from commit 59f44d8)
2019-11-22 14:28:45 +03:00
Kuroshini
59f44d84f1 Establishment facet visibble tags only 2019-11-22 14:27:40 +03:00
Kuroshini
17931eba53 Facet with tags id instead of text values
(cherry picked from commit 2ebe6e6)
2019-11-22 13:55:56 +03:00
Kuroshini
2ebe6e60a3 Facet with tags id instead of text values 2019-11-22 13:54:07 +03:00
Anatoly
f7703f18b0 refactored upload image endpoint 2019-11-22 13:02:04 +03:00
evgeniy-st
00d7bbe7ec update crontab parameters 2019-11-22 12:45:14 +03:00
evgeniy-st
ce41b96ec3 update dev settings 2019-11-22 12:34:11 +03:00
Виктор Гладких
806a7d63e4 Migrate 2019-11-22 11:43:22 +03:00
Kuroshini
a758cad48f Fix f swagger 2019-11-22 11:11:39 +03:00
d.kuzmenko
9fbc00a6dd Merge branch 'migrate/site_settings' into 'develop'
Migrate/site settings

See merge request gm/gm-backend!152
2019-11-22 08:06:04 +00:00
Виктор Гладких
3a1e55ba1f Site settings migrate data 2019-11-22 10:58:07 +03:00
Виктор Гладких
f52cc8eccc Merge branch 'develop' into migrate/site_settings 2019-11-22 10:38:50 +03:00
Виктор Гладких
ee781150fd Site settings 2019-11-22 10:38:03 +03:00
alex
d30d68bf17 partner test 2019-11-22 10:32:01 +03:00
Kuroshini
7e6b2712a9 Fix facet 2019-11-22 10:24:05 +03:00
Kuroshini
0fe3e3f8ba Fix 2019-11-22 10:17:34 +03:00
alex
22e1478a1f partner back api 2019-11-22 09:31:21 +03:00
Kuroshini
735e409734 Facets for products 2019-11-21 22:54:33 +03:00
Kuroshini
9f1e9effaf Facets for news 2019-11-21 22:46:49 +03:00
Kuroshini
7376c61c47 Facets for establishments 2019-11-21 22:43:10 +03:00
Kuroshini
e6b353e864 ES Facets in addition to results 2019-11-21 21:59:24 +03:00
evgeniy-st
04d6412f39 Merge branch 'develop' into feature/in_favorites 2019-11-21 18:18:09 +03:00