Commit Graph

1934 Commits

Author SHA1 Message Date
Виктор Гладких
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
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +03:00
Semyon Yekhmenin
8e7ad07111 Merge branch 'feature/is_published_field_type_fix' into 'develop'
Fixed is_published filed type in serializer

See merge request gm/gm-backend!151
2019-11-21 14:46:56 +00:00
Semyon Yekhmenin
4209b38d93 Fixed is_published filed type in serializer 2019-11-21 14:46:56 +00:00
Олег Хаятов
dda58a1f5a Merge branch 'feature/news_web_view_update' into 'develop'
Feature/news web view update

See merge request gm/gm-backend!144
2019-11-21 14:12:22 +00:00
Semyon Yekhmenin
98e140b0c4 Feature/news web view update 2019-11-21 14:12:22 +00:00
alex
86e29173ba transfer partner 2019-11-21 16:45:27 +03:00
Kuroshini
8e215b2555 Demonstration carousel item 2019-11-21 16:40:53 +03:00
alex
9156d9cc35 fix partner migrations 2019-11-21 14:00:17 +03:00
alex
a6bfb3ea6b partner migrations 2019-11-21 13:47:37 +03:00
alex
d9b88f7ef9 partner name field 2019-11-21 13:32:50 +03:00
Anatoly
3f164459a7 added transfer for filling city gallery 2019-11-21 12:37:13 +03:00
alex
e6a143f6ea partner model 2019-11-21 12:29:55 +03:00
Виктор Гладких
98468f2604 Fix ELASTICSEARCH_DSL_AUTOSYNCOC 2019-11-21 11:16:02 +03:00
alex
bebdf1e269 review test and fixes review crud api 2019-11-21 11:12:52 +03:00
Anatoly
e303e15f32 added two characteristics to wine detail serializer 2019-11-21 10:28:17 +03:00
Anatoly
617552841f refactored product, fix transfer and etc., see changelist 2019-11-21 09:58:43 +03:00
alex
a2a8b2927f Merge remote-tracking branch 'origin/develop' into develop 2019-11-21 09:12:00 +03:00
alex
cad0f8df0a award test 2019-11-21 09:11:52 +03:00
Dmitriy Kuzmenko
009ecf1973 fix filter for tag_category 2019-11-21 08:42:05 +03:00
Dmitriy Kuzmenko
7b2e8374a0 change settings 2019-11-21 00:45:48 +03:00
Dmitriy Kuzmenko
74c1b7069a fix product tags 2019-11-21 00:23:17 +03:00
Kuroshini
2dc7f1e89d Boost the tempo 2019-11-20 20:35:56 +03:00
Kuroshini
06b8582976 Revert "Estabishment_type field"
This reverts commit 280da2d
2019-11-20 19:41:22 +03:00
Kuroshini
49940ebab4 Revert "Estabishment_type field #2"
This reverts commit b60dd87
2019-11-20 19:41:20 +03:00
Kuroshini
b60dd870f9 Estabishment_type field #2 2019-11-20 19:32:45 +03:00
Kuroshini
280da2d7de Estabishment_type field 2019-11-20 19:31:43 +03:00
Kuroshini
cd328186e1 wildcard boosting 2019-11-20 17:01:24 +03:00
alex
45fee0355c Merge remote-tracking branch 'origin/develop' into develop 2019-11-20 16:38:22 +03:00
alex
824cbe203b award back api 2019-11-20 16:38:11 +03:00
Виктор Гладких
a17e83ebe5 On sync elasticsearch 2019-11-20 16:36:37 +03:00
Dmitriy Kuzmenko
15ddbd5a7e Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 16:29:57 +03:00
Dmitriy Kuzmenko
2e17d7265d add back api for collection 2019-11-20 16:29:46 +03:00
alex
7ba3913000 award filter 2019-11-20 16:17:49 +03:00
evgeniy-st
bea485f936 city may be null 2019-11-20 15:56:56 +03:00
d.kuzmenko
62d7f13f80 Merge branch 'fix/tags_many' into 'develop'
Fix/tags many

See merge request gm/gm-backend!143
2019-11-20 12:43:05 +00:00