Commit Graph

69 Commits

Author SHA1 Message Date
a.gorbunov
c6e12f3320 must_of_the_week behaviour for update. public_mark has been returned 2020-02-08 10:37:28 +00:00
a.gorbunov
f854cd6ba5 last update by for establishment 2020-02-07 11:41:49 +00:00
a.gorbunov
5b6db0f974 must of the week mark 2020-02-07 10:40:30 +00:00
a.gorbunov
0eb6a73e09 Carousel mixin 2020-02-07 10:25:52 +00:00
Anatoly
8993ec1097 added documentation for /api/back/establishments/employees/<id>/ 2020-02-06 11:19:41 +03:00
Anatoly
8eb07205e1 added report app 2020-02-05 16:46:30 +03:00
a.gorbunov
a3a66a88e6 allow bind or remove award for establishment 2020-02-05 12:31:02 +00:00
Anatoly
15b8241213 refactored serializers that retrieving phone numbers 2020-02-03 13:11:13 +03:00
Kuroshini
62eb5b0ccb get menus method 2020-01-30 22:06:56 +03:00
dormantman
e067e8e793 Added menu upload files 2020-01-28 18:29:02 +03:00
Kuroshini
e517d87d7e fix cropper 2020-01-20 19:00:36 +03:00
Kuroshini
6ad1849835 fix cropper 2020-01-20 17:41:35 +03:00
Kuroshini
9975b5a8ab fix crop 2020-01-20 17:09:38 +03:00
Kuroshini
ea485d9960 optimize images at least for establishments 2020-01-16 19:21:57 +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
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
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
Kuroshini
660c8e791b tags translation 2019-12-20 19:08:53 +03:00
Kuroshini
d1699e001e tag models translations in interface dictionary 2019-12-20 18:01:52 +03:00
littlewolf
3dd76503a5 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/location/models.py
#	apps/transfer/management/commands/transfer.py
2019-12-20 11:55:23 +03:00
Kuroshini
22aefc2f83 description is_active logic 2019-12-17 17:34:20 +03:00
Kuroshini
900846951e localized description 2019-12-17 16:09:03 +03:00
Kuroshini
2863a338e1 translated fields work out 2019-12-17 16:09:03 +03:00
Anatoly
956aae281f refactored fix duplicates 2019-12-16 13:46:52 +03:00
Anatoly
86257153ac refactored guide ad label photos 2019-12-13 12:21:31 +03:00
Виктор Гладких
420c673afd Fix 2019-11-25 16:52:27 +03:00
Anatoly
65bb22bb21 reassign sorl-thumbnail engine 2019-11-22 19:04:47 +03:00
Виктор Гладких
376c8cdff3 State test news with contentpage permission 2019-11-22 16:00:59 +03:00
Anatoly
f7703f18b0 refactored upload image endpoint 2019-11-22 13:02:04 +03:00
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +03:00
evgeniy-st
7f8f72815e append city or country to ProductDocumentSerialzier 2019-11-20 12:21:55 +03:00
Kuroshini
5c4c4c60c3 ES as separate server 2019-11-18 20:12:58 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
a.feteleu
d0165df987 fix translation 2019-11-03 20:31:50 +03:00
Anatoly
4f89d7603e change translation mechanics 2019-11-03 17:00:47 +03:00
evgeniy-st
30a58473c3 using a fallback language for translation 2019-10-31 16:11:46 +03:00
Dmitriy Kuzmenko
638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
#	apps/establishment/admin.py
#	project/settings/base.py
2019-10-30 19:12:59 +03:00
Dmitriy Kuzmenko
97f75dfc05 add filter accounts for existing users 2019-10-29 14:32:51 +03:00
Anatoly
d12df5c8e1 added WineAppellation model 2019-10-28 12:33:48 +03:00
Anatoly
91790bbc39 refactored 2019-10-04 14:30:34 +03:00
Anatoly
b2f900d15d gm-148: refactored 2019-10-04 13:25:42 +03:00
Anatoly
4890e00b95 gm-148: refactored 2019-10-04 11:50:29 +03:00
Anatoly
d9635a8599 gm-148: refactored 2019-10-02 10:16:32 +03:00
Виктор Гладких
86d754f4bb validate json translated field 2019-09-26 11:38:37 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Semyon Yekhmenin
e2e7734bf2 Feature/advertisements update 2019-09-19 07:05:32 +00:00
evgeniy-st
e67d7767a1 Elasticsearch: establishment address. Filter by country_id, country_code 2019-09-17 17:33:07 +03:00