Commit Graph

1716 Commits

Author SHA1 Message Date
Kuroshini
8641188c45 Chosen tags for artisans 2019-11-17 22:16:20 +03:00
Anatoly
0d2f961ad5 added temporary potential bug (change auto_crop_images dict names for News) 2019-11-17 21:52:07 +03:00
Anatoly
62c4ab8d74 added temporary potential bug (change auto_crop_images dict names for News) 2019-11-17 20:39:03 +03:00
Anatoly
c2c182e992 remove duplicated migration 2019-11-17 14:51:48 +03:00
Anatoly
dce951c4f9 Merge branch 'develop' into feature/establishment-gallery
# Conflicts:
#	apps/product/serializers/common.py
2019-11-17 14:25:41 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Dmitriy Kuzmenko
09db5c9540 minor changes for tags translation command 2019-11-16 23:26:50 +03:00
Dmitriy Kuzmenko
82c79091a3 add some change for add translations for tags 2019-11-16 23:24:22 +03:00
Dmitriy Kuzmenko
9f03da9bef fix for tag migration 2019-11-16 23:03:17 +03:00
Dmitriy Kuzmenko
b1d176c583 enable elastic 2019-11-16 23:01:22 +03:00
Dmitriy Kuzmenko
ca9843482e Merge branch 'develop' into fix_tags 2019-11-16 22:57:43 +03:00
Dmitriy Kuzmenko
ad3966b2aa add method for label 2019-11-16 22:56:32 +03:00
Dmitriy Kuzmenko
45b0b93068 add new migrations for tags 2019-11-16 22:49:38 +03:00
Kuroshini
70b2110744 Fix booking slots order 2019-11-16 20:51:40 +03:00
Kuroshini
9d4a672d67 Multilingual textfield products analyzers 2019-11-16 20:14:25 +03:00
Kuroshini
be0d63cf07 Fix products search 2019-11-16 19:59:10 +03:00
Kuroshini
8a86018a5e Fix wines db queries #2 2019-11-16 18:42:26 +03:00
Kuroshini
cc67499601 Fix wines db queries 2019-11-16 18:32:38 +03:00
alex
94d20469f6 Merge remote-tracking branch 'origin/develop' into develop 2019-11-16 16:57:38 +03:00
alex
78e42550c1 add address to establishment similar and collection establishment 2019-11-16 16:57:26 +03:00
Kuroshini
2e463feb8d Sort countries by name accordingly to locale 2019-11-16 16:23:31 +03:00
alex
4e005a7a4d migrate subscribers 2019-11-16 15:56:23 +03:00
Kuroshini
144b5abdbf Fix issue w/ product display name 2019-11-16 14:58:59 +03:00
Kuroshini
94797c354a Fix search results produt name 2019-11-16 14:48:32 +03:00
Kuroshini
5a014ca7fe Fix some product search issues 2019-11-16 14:38:35 +03:00
Kuroshini
bff533e7d5 Tag types 2019-11-16 14:13:00 +03:00
Kuroshini
ca61359a81 Fix product type serializer 2019-11-16 13:35:21 +03:00
Dmitriy Kuzmenko
36d16625ea change filter for Establishment 2019-11-16 13:28:03 +03:00
d.kuzmenko
dc10203f8a Merge branch 'feature/guestonline_no_period_fix' into 'develop'
Fixed problem with no required period in guest online service response

See merge request gm/gm-backend!137
2019-11-16 09:38:33 +00:00
Semyon Yekhmenin
8b656b9bb6 Fixed problem with no required period in guest online service response 2019-11-16 09:38:33 +00:00
a.feteleu
c725da6a9b refactored transfer ads 2019-11-16 01:08:31 +03:00
Anatoly
6c82af1940 Merge branch 'feature/transfer-ad' into develop
# Conflicts:
#	apps/advertisement/transfer_data.py
#	apps/transfer/serializers/advertisement.py
2019-11-16 00:19:23 +03:00
Anatoly
31399cea83 added advertisement image import 2019-11-16 00:18:07 +03:00
Anatoly
671a92912e remove debug tracer 2019-11-15 21:06:18 +03:00
Anatoly
6f2d41c1ad added method to transfer advertisement 2019-11-15 21:06:18 +03:00
Anatoly
c293ae4b9c remove debug tracer 2019-11-15 21:04:37 +03:00
Kuroshini
9c635cd60d Define search boosts 2019-11-15 20:29:55 +03:00
Kuroshini
c71e7f10dd Search in all locales 2019-11-15 19:59:16 +03:00
Олег Хаятов
ae53a18e08 Merge branch 'feature/filter-favs-by-tag' into 'develop'
Filters for news favorites

See merge request gm/gm-backend!133
2019-11-15 15:51:09 +00:00
Kuroshini
153ccd7bd9 International news 2019-11-15 18:25:40 +03:00
evgeniy-st
90fad60fc6 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 16:10:38 +03:00
evgeniy-st
3bf17a8fce update elasticsearch requirements 2019-11-15 16:10:14 +03:00
alex
422b89ede9 fix comment transfer 2019-11-15 16:10:01 +03:00
d.kuzmenko
868cb048fe Merge branch 'feature/web_establishments_type_and_subtypes_index_name' into 'develop'
Added type and subtypes fields with index names in establishment list view

See merge request gm/gm-backend!136
2019-11-15 13:06:18 +00:00
Semyon Yekhmenin
73f20bd2e8 Added type and subtypes fields with index names in establishment list view 2019-11-15 13:06:17 +00:00
Dmitriy Kuzmenko
8f6cf792e7 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 16:05:01 +03:00
Dmitriy Kuzmenko
2cd7755d7e add CRUD collections for back 2019-11-15 16:04:54 +03:00
Anatoly
4b4dc27a49 added method to transfer advertisement 2019-11-15 15:59:02 +03:00
Kuroshini
798e58202c Return hardcode for chosen tags 2019-11-15 15:53:26 +03:00
alex
71dd52c194 news in_favs nested fix 2019-11-15 15:28:27 +03:00