Kuroshini
|
768a01e119
|
return in_favorites flag
|
2019-12-27 17:39:05 +03:00 |
|
d.kuzmenko
|
c32c950260
|
Merge branch 'feature/profile' into 'develop'
Feature/profile
See merge request gm/gm-backend!190
|
2019-12-27 13:57:31 +00:00 |
|
Виктор Гладких
|
4e82d5275a
|
Fix
|
2019-12-27 16:55:01 +03:00 |
|
Kuroshini
|
ea20d6d4c1
|
remove lookups from subtypes
|
2019-12-27 16:52:10 +03:00 |
|
Виктор Гладких
|
ab5bb5c190
|
Merge branch 'develop' into feature/profile
|
2019-12-27 16:35:57 +03:00 |
|
Виктор Гладких
|
660d60e656
|
Lite refactor
|
2019-12-27 16:30:31 +03:00 |
|
alex
|
f31c74dae8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-27 16:20:21 +03:00 |
|
Виктор Гладких
|
caa17bf9f4
|
Serialize employee with positions, public_mark and establishment
|
2019-12-27 16:13:22 +03:00 |
|
Kuroshini
|
57c7f0dcdf
|
fix ES
|
2019-12-27 15:56:37 +03:00 |
|
alex
|
bc6107bcfc
|
preview_image to establishment and product type and subtype
|
2019-12-27 15:43:28 +03:00 |
|
Kuroshini
|
57be30fa0e
|
fix es establishments serializer
|
2019-12-27 14:49:35 +03:00 |
|
alex
|
ae486d81fa
|
city filter for establishment
|
2019-12-27 14:32:09 +03:00 |
|
alex
|
32ae1856b6
|
preview_image to establishment and product type and subtype
|
2019-12-27 12:42:45 +03:00 |
|
alex
|
b958e0b597
|
preview_image fix
|
2019-12-27 11:16:38 +03:00 |
|
alex
|
e3d7618c62
|
preview_image to establishment and product type and subtype
|
2019-12-27 09:47:48 +03:00 |
|
Kuroshini
|
8abb582e49
|
fix patch news BO
|
2019-12-26 19:23:28 +03:00 |
|
Kuroshini
|
0da58133fc
|
Fix news patch
|
2019-12-26 18:34:59 +03:00 |
|
alex
|
396921fa75
|
fix GM-318
|
2019-12-26 16:02:17 +03:00 |
|
Kuroshini
|
7648e478f5
|
allow city main image changing
|
2019-12-26 15:00:05 +03:00 |
|
alex
|
668bc92b97
|
fix print
|
2019-12-26 10:45:17 +03:00 |
|
alex
|
0152538333
|
author for review text
|
2019-12-26 10:33:27 +03:00 |
|
Kuroshini
|
ac2dc2344e
|
try to fix issue w/ news elastic update
|
2019-12-25 18:50:59 +03:00 |
|
Kuroshini
|
f3c48281d4
|
back office news reformat
|
2019-12-25 18:09:58 +03:00 |
|
d.kuzmenko
|
61eca800fc
|
Merge branch 'review_users' into 'develop'
Review users
See merge request gm/gm-backend!188
|
2019-12-25 12:54:11 +00:00 |
|
alex
|
d173664750
|
rm comments
|
2019-12-25 15:35:55 +03:00 |
|
Kuroshini
|
cd194b79bd
|
fix artisans chosen tags
|
2019-12-25 14:05:48 +03:00 |
|
Kuroshini
|
432873da31
|
fix main_image for news
(cherry picked from commit 8ca213a)
|
2019-12-25 13:48:32 +03:00 |
|
alex
|
bc0db915be
|
author for review text
|
2019-12-25 09:15:36 +03:00 |
|
alex
|
8a34ef6477
|
Merge remote-tracking branch 'origin/develop' into review_users
|
2019-12-25 09:15:13 +03:00 |
|
littlewolf
|
670da807af
|
Fix fake country flag
|
2019-12-24 14:10:47 +03:00 |
|
alex
|
92e5f7a40b
|
signals for text field
|
2019-12-24 13:40:27 +03:00 |
|
Anatoly
|
62e12d8570
|
Merge remote-tracking branch 'origin/feature/fix-country-region-city-transfer' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
|
2019-12-24 12:25:42 +03:00 |
|
Anatoly
|
d9e45702ec
|
merge
|
2019-12-24 12:24:13 +03:00 |
|
Anatoly
|
858b6f3544
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/serializers/news.py
# apps/utils/models.py
|
2019-12-24 12:10:16 +03:00 |
|
littlewolf
|
d4c2af9d65
|
Fix country
|
2019-12-24 11:53:46 +03:00 |
|
alex
|
069a2ad2a8
|
review text author model
|
2019-12-24 11:35:20 +03:00 |
|
littlewolf
|
0c2dacb3bf
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/serializers/news.py
# apps/utils/models.py
|
2019-12-24 11:03:08 +03:00 |
|
alex
|
18d6c10120
|
footer links
|
2019-12-24 10:29:48 +03:00 |
|
Олег Хаятов
|
f0ed1c0a8c
|
Merge branch 'feature/carousel_international_news' into 'develop'
feature/carousel_international_news
See merge request gm/gm-backend!79
|
2019-12-23 14:39:45 +00:00 |
|
Semyon Yekhmenin
|
28331e5274
|
Implemented filtering carousel entries by country code when country code specified and international carousel when not
|
2019-12-23 14:39:45 +00:00 |
|
Dmitriy Kuzmenko
|
63304aa2d1
|
add merge migrations
|
2019-12-23 17:16:33 +03:00 |
|
d.kuzmenko
|
cd7ba1996d
|
Merge branch 'feature/collection-slugs' into 'develop'
Feature/collection slugs
See merge request gm/gm-backend!181
|
2019-12-23 14:09:27 +00:00 |
|
Dmitriy Kuzmenko
|
6e35713772
|
add merge migrations
|
2019-12-23 17:07:49 +03:00 |
|
Dmitriy Kuzmenko
|
2580b9f218
|
Merge branch 'develop' into feature/collection-slugs
# Conflicts:
# requirements/base.txt
|
2019-12-23 16:57:24 +03:00 |
|
d.kuzmenko
|
56ed5432e3
|
Merge branch 'fix/file-upload-size' into 'develop'
Fixed upload size limit
See merge request gm/gm-backend!161
|
2019-12-23 13:50:35 +00:00 |
|
d.kuzmenko
|
dd11a4aef8
|
Merge branch 'feature/subscription-types' into 'develop'
Feature/subscription types
See merge request gm/gm-backend!128
|
2019-12-23 13:50:09 +00:00 |
|
Semyon Yekhmenin
|
3ff7246bea
|
Feature/subscription types
|
2019-12-23 13:50:09 +00:00 |
|
d.kuzmenko
|
cb8f0fe2d9
|
Merge branch 'feature/news_event_model_update' into 'develop'
Feature/news event model update
See merge request gm/gm-backend!77
|
2019-12-23 13:45:47 +00:00 |
|
Semyon Yekhmenin
|
9e19a8fc97
|
Feature/news event model update
|
2019-12-23 13:45:47 +00:00 |
|
d.kuzmenko
|
6a68042178
|
Merge branch 'feature/permission_liquor' into 'develop'
Feature/permission liquor
See merge request gm/gm-backend!175
|
2019-12-23 13:40:13 +00:00 |
|