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 |
|
Kuroshini
|
5c4c4c60c3
|
ES as separate server
|
2019-11-18 20:12:58 +03:00 |
|
Kuroshini
|
c7033d4b10
|
Revert "Revert "ES as separate server""
This reverts commit f81e879
|
2019-11-18 18:09:19 +03:00 |
|
Kuroshini
|
f81e879ae4
|
Revert "ES as separate server"
This reverts commit 3536be8
|
2019-11-18 18:03:21 +03:00 |
|
Kuroshini
|
3536be8394
|
ES as separate server
|
2019-11-18 18:01:55 +03:00 |
|
Anatoly
|
012d2dcb23
|
added validation to Company serializer
|
2019-11-18 17:58:46 +03:00 |
|
Anatoly
|
0d9d45bcc5
|
added model Product and bo endpoints
|
2019-11-18 17:58:46 +03:00 |
|
Kuroshini
|
2a680311ae
|
Revert "use another ES server"
This reverts commit 89191fc
|
2019-11-18 17:37:10 +03:00 |
|
Kuroshini
|
89191fcf35
|
use another ES server
|
2019-11-18 17:35:16 +03:00 |
|
Kuroshini
|
9212f85ee5
|
Visible tags for establishments
|
2019-11-18 15:15:33 +03:00 |
|
alex
|
303d7f5277
|
city for favorite establishment
|
2019-11-18 13:51:44 +03:00 |
|
alex
|
dc0b4ce107
|
fix collection establishment in_fav
|
2019-11-18 13:12:24 +03:00 |
|
Anatoly
|
d0fec2591f
|
added bo endpoints for ads
|
2019-11-18 12:48:39 +03:00 |
|
alex
|
4412e39e96
|
filter by establishment for review
|
2019-11-18 11:19:35 +03:00 |
|
Kuroshini
|
f4ebd58e09
|
Tune products ES
|
2019-11-18 01:37:41 +03:00 |
|
Kuroshini
|
83153b14c1
|
Add wine_region and wine_sub_region to ES
|
2019-11-18 01:26:01 +03:00 |
|
Kuroshini
|
f8c9a5c830
|
Wine regions route
|
2019-11-18 01:20:35 +03:00 |
|
Anatoly
|
cb1366b57b
|
added grape variety attr to es
|
2019-11-18 00:01:30 +03:00 |
|
Kuroshini
|
d9e46fdfad
|
Wine color for wine tags only
|
2019-11-17 23:57:08 +03:00 |
|