Commit Graph

1736 Commits

Author SHA1 Message Date
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
a.feteleu
277fe8d17e fixed SiteFeatureSerializer 2019-11-15 13:43:32 +03:00
Semyon
49335c3bc4 Added establishment type and subtypes to search results 2019-11-15 13:04:48 +03:00
Anatoly
43fba17288 remove transfer app config 2019-11-15 13:02:04 +03:00
Anatoly
1dbd7a6451 refactored advertisements 2019-11-15 13:02:04 +03:00
Dmitriy Kuzmenko
12d44c0a0d enable elastic 2019-11-15 12:18:04 +03:00
Dmitriy Kuzmenko
b52a5dc890 add migration 2019-11-15 12:15:39 +03:00
Dmitriy Kuzmenko
4a53cca6c0 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 12:15:03 +03:00
Dmitriy Kuzmenko
41c842e224 change review transfer 2019-11-15 12:14:53 +03:00
d.kuzmenko
0981143cae Merge branch 'feature/product_establishment_subtype' into 'develop'
Added establishment subtype to product view

See merge request gm/gm-backend!132
2019-11-15 09:13:28 +00:00
Semyon Yekhmenin
36b47a6cba Added establishment subtype to product view 2019-11-15 09:13:28 +00:00
evgeniy-st
43963f3020 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 11:57:16 +03:00
evgeniy-st
ff006eb6fb Try this style of update tasks of the establishments 2019-11-15 11:56:16 +03:00
alex
1bcf4ca112 Merge remote-tracking branch 'origin/develop' into develop 2019-11-15 10:53:37 +03:00
alex
4d302395a9 fix product in_fav 2019-11-15 10:53:28 +03:00
Виктор Гладких
0f142d3870 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 10:48:18 +03:00
Виктор Гладких
b590a762c1 Fix update 2019-11-15 10:48:04 +03:00
alex
0dbb2c64cd fix new in_fav detail 2019-11-15 10:46:21 +03:00
alex
5f52806d97 Merge remote-tracking branch 'origin/develop' into develop 2019-11-15 10:36:33 +03:00
alex
1348a1def6 notification serializer start 2019-11-15 10:36:23 +03:00
evgeniy-st
b8df164369 update celery to 4.3.0 2019-11-15 10:33:33 +03:00
evgeniy-st
8951de7399 updated requirements, updated ES task 2019-11-15 10:23:16 +03:00
alex
4ebece45d3 Merge remote-tracking branch 'origin/develop' into develop 2019-11-15 10:21:37 +03:00
alex
418ef27694 transfer newsletter_subscriber 2019-11-15 10:21:28 +03:00
Виктор Гладких
2931381126 Fix update employee 2019-11-15 10:12:19 +03:00
alex
e922117c61 refactor subscriber model 2019-11-15 10:09:26 +03:00
Dmitriy Kuzmenko
6b83003eac add product review loader 2019-11-15 02:44:09 +03:00
Kuroshini
2367fec098 Use establishment type product serializer w/ index name 2019-11-15 00:28:00 +03:00
Dmitriy Kuzmenko
956467e999 add view count to news serializer 2019-11-15 00:26:14 +03:00
d.kuzmenko
c644cbfd64 Merge branch 'feature/transfer-page-counters' into 'develop'
Add rating.views_count transfer

See merge request gm/gm-backend!134
2019-11-14 21:09:26 +00:00
Kuroshini
3bf029616f Try to fix indexing 2019-11-14 23:58:12 +03:00