Commit Graph

1787 Commits

Author SHA1 Message Date
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +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
Kuroshini
cf22027dc1 Search by wildcard 2019-11-20 15:40:10 +03:00
Виктор Гладких
5a55fa82a2 Codestyle 2019-11-20 15:32:36 +03:00
Виктор Гладких
c570cfdadd Fix 2019-11-20 15:29:03 +03:00
Kuroshini
be581c7b7d Dynamic front filters #1 2019-11-20 14:15:25 +03:00
Anatoly
ef1af8c3ac added city gallery 2019-11-20 13:27:26 +03:00
alex
2f6d0cf4ed review filter fix 2019-11-20 13:00:50 +03:00
alex
61e049f5c3 review filter by product id 2019-11-20 12:56:57 +03:00
Anatoly
d3faacba3b fix product view mixins 2019-11-20 12:41:43 +03:00
evgeniy-st
0639aee494 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 12:24:41 +03:00
evgeniy-st
7f8f72815e append city or country to ProductDocumentSerialzier 2019-11-20 12:21:55 +03:00
Anatoly
0e6a4eded2 fixed transfer_product_reviews 2019-11-20 12:10:28 +03:00
Anatoly
498e8ac126 fix product country filter in ES 2019-11-20 11:56:31 +03:00
a.feteleu
d932df4392 add unknown migrations from developm server:-( 2019-11-20 10:07:23 +03:00
a.feteleu
1ab7333dd5 Merge branch 'develop' of ssh://gl.id-east.ru:221/gm/gm-backend into develop 2019-11-20 10:02:34 +03:00
Виктор Гладких
b42b75609a Check elasticsearch dsl autosync 2019-11-20 09:59:23 +03:00
a.feteleu
8e01c2092d Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 09:43:58 +03:00
Anatoly
1a1a2a2d24 added bo endpoints for establishment notes 2019-11-20 09:43:45 +03:00
a.feteleu
41b43b7d55 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 09:26:57 +03:00
alex
46d4898428 user back api test 2019-11-20 09:11:17 +03:00
alex
7456e9c3af hardcoded review filter 2019-11-19 20:47:10 +03:00
a.feteleu
73bc390121 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-19 18:54:41 +03:00
Kuroshini
c4e9f9e843 Filter products by country 2019-11-19 18:54:22 +03:00
a.feteleu
a76755907b Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-19 18:48:33 +03:00
Виктор Гладких
551cb2d5b6 Fix index elastic 2019-11-19 18:43:37 +03:00
a.feteleu
10579843af Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-19 18:29:20 +03:00
Anatoly
9975f3f3b5 added bo endpoints for product notes 2019-11-19 18:28:53 +03:00
alex
0fe7c50e5b logging 2019-11-19 17:50:04 +03:00
alex
a8cc734d20 back user api 2019-11-19 17:48:20 +03:00
a.feteleu
0b1b89b6ba added merge migration 2019-11-19 17:38:53 +03:00
Anatoly
484a9a3250 added field - average price to model Product and transfer command 2019-11-19 17:37:23 +03:00
d.kuzmenko
b6292261e4 Merge branch 'fix/tag_product' into 'develop'
Fix/tag product

See merge request gm/gm-backend!142
2019-11-19 14:30:16 +00:00
alex
d03a151bf8 fix slice review 2019-11-19 16:58:12 +03:00
alex
8b194f8324 fix transfer review text 2019-11-19 16:40:03 +03:00
Виктор Гладких
e51070f500 Merge branch 'develop' into fix/tag_product 2019-11-19 16:39:39 +03:00
Виктор Гладких
68baebcbcc Fix fix 2019-11-19 16:39:04 +03:00
d.kuzmenko
9d816ade6b Merge branch 'fix/tag_product' into 'develop'
Fix

See merge request gm/gm-backend!141
2019-11-19 13:08:52 +00:00
Виктор Гладких
fb0157042a Fix 2019-11-19 15:45:49 +03:00
d.kuzmenko
a00cb91b8b Merge branch 'fix/tag_product' into 'develop'
Fix category, poduct-tags

See merge request gm/gm-backend!140
2019-11-19 12:34:40 +00:00
Олег Хаятов
601268eae0 Merge branch 'feature/bo_news_by_type_filter' into 'develop'
Added filter by type for bo news list

See merge request gm/gm-backend!139
2019-11-19 12:13:43 +00:00
Semyon Yekhmenin
7d8e4c96f1 Added filter by type for bo news list 2019-11-19 12:13:43 +00:00
Виктор Гладких
3b0c872d51 Merge branch 'develop' into fix/tag_product 2019-11-19 15:06:31 +03:00
Виктор Гладких
39a406cbc1 Product type tags 2019-11-19 15:04:12 +03:00
Kuroshini
dbe39ae5cb Search establishment by region id
(cherry picked from commit 7a5774a)
2019-11-19 14:06:47 +03:00
Виктор Гладких
c9a0fb6656 Fix category, poduct-tags 2019-11-19 12:17:05 +03:00
alex
267544a0b1 merge for migration 2019-11-19 09:48:25 +03:00
Kuroshini
f6e5f84889 fix issue w/ empty tags 2019-11-18 22:41:14 +03:00
Kuroshini
d080f689cb Change Pagination for collection 2019-11-18 22:23:23 +03:00