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 |
|
Ruslan Stepanov
|
8efd4e3c77
|
Fix slugify
|
2019-12-23 13:20:46 +00:00 |
|
alex
|
e4dada0d1d
|
news transfer fix add tags
|
2019-12-23 16:01:47 +03:00 |
|
alex
|
14b8d16e90
|
news transfer fix
|
2019-12-23 15:54:58 +03:00 |
|
alex
|
cbca13093f
|
fix news type
|
2019-12-23 15:43:27 +03:00 |
|
alex
|
1c04703c77
|
fix test and news type
|
2019-12-23 15:39:54 +03:00 |
|
Kuroshini
|
50d0997569
|
Merge remote-tracking branch 'origin/bug/bind-author-news' into develop
|
2019-12-23 15:17:32 +03:00 |
|
dormantman
|
1849166bae
|
Fix author bug
|
2019-12-23 15:12:27 +03:00 |
|
d.kuzmenko
|
8083965619
|
Merge branch 'fix/qs_for_site_feature' into 'develop'
Add qs to SiteFeatures views
See merge request gm/gm-backend!187
|
2019-12-23 11:59:29 +00:00 |
|
Виктор Гладких
|
31fa1dacce
|
Add qs to SiteFeatures views
|
2019-12-23 14:54:42 +03:00 |
|
Kuroshini
|
61c1f92c2c
|
change serializer for news photo binding
|
2019-12-23 13:56:10 +03:00 |
|
Kuroshini
|
6f9cec2450
|
fix swagger
|
2019-12-23 13:54:10 +03:00 |
|
Kuroshini
|
3b661f24ca
|
fix issues w/ tags
|
2019-12-23 13:51:29 +03:00 |
|
littlewolf
|
56309f2a10
|
Update fake country flag
|
2019-12-23 13:14:48 +03:00 |
|
Anatoly
|
2fb338bc59
|
refactored method to get similar list on entities (see todo: establishment/models.py)
|
2019-12-23 12:59:47 +03:00 |
|
alex
|
f6dac3cbcd
|
fix news test
|
2019-12-23 12:33:31 +03:00 |
|
dormantman
|
9e7a950088
|
Set code style
|
2019-12-23 12:13:13 +03:00 |
|
alex
|
7525e6ceef
|
Merge branch 'nes_transfer' into develop
|
2019-12-23 11:55:05 +03:00 |
|
alex
|
17fdc7705e
|
news transfer fin
|
2019-12-23 11:53:34 +03:00 |
|
Anatoly
|
a6bcbdddc1
|
fix es image url
|
2019-12-23 09:44:29 +03:00 |
|
Anatoly
|
cc7125b468
|
added image url to es
|
2019-12-23 09:19:16 +03:00 |
|