Commit Graph

27 Commits

Author SHA1 Message Date
Kuroshini
33478580aa Review fixes 2019-09-30 16:40:46 +03:00
Kuroshini
019ac97d19 Add vintage year to detail 2019-09-30 13:50:17 +03:00
evgeniy-st
403a60623a Merge branch 'develop' into feature/refactor-establishments 2019-09-27 10:05:15 +03:00
Anatoly
f1eec96ce8 Merge branch 'develop' into feature/gm-127
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/urls/common.py
2019-09-26 14:29:39 +03:00
Виктор Гладких
40d9f2f2ed check 2019-09-26 11:45:26 +03:00
Виктор Гладких
86d754f4bb validate json translated field 2019-09-26 11:38:37 +03:00
Anatoly
207e35feb1 GM-127: in progress 2019-09-25 19:39:37 +03:00
evgeniy-st
f18c18110c Refactor some establishment serializer 2019-09-25 15:32:45 +03:00
Kuroshini
f38924db42 Fix favorites creation by slug 2019-09-25 14:09:24 +03:00
Kuroshini
1534c9b09c Remove unique
(cherry picked from commit f793c20)
2019-09-24 14:51:51 +03:00
Kuroshini
65914659e5 Slugs serializers 2019-09-24 12:31:35 +03:00
Kuroshini
6420a676df create slugs manually 2019-09-24 10:38:04 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
evgeniy-st
83fddd63c3 fix migration establishment 2019-09-23 16:41:20 +03:00
Anatoly
217c11b970 GM-124: Доработать модель establishment-а 2019-09-23 12:29:08 +03:00
Anatoly
193ecfba7a fixed comments 2019-09-20 15:38:20 +03:00
Anatoly
09c9d666b5 rename image_url to image, preview_image_url to preview_image 2019-09-20 14:42:34 +03:00
Anatoly
413c93bead fixed problem with image, refactored favorites, collection 2019-09-20 13:35:59 +03:00
Anatoly
2ce69eb003 added establishment tag identifier to TagListAPIView 2019-09-19 17:10:18 +03:00
Anatoly
a09d6b28f1 Merge branch 'feature/gm-80' into develop
# Conflicts:
#	apps/establishment/serializers/back.py
2019-09-19 14:32:10 +03:00
Semyon Yekhmenin
f700491d42 Added employee position priority 2019-09-19 07:02:45 +00:00
Anatoly
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
Semyon Yekhmenin
bb5e294d6e Fixed preview image crop 2019-09-18 13:52:09 +00:00
Kuroshini
4ee6306efb Add transportation text field to establishment model 2019-09-17 13:47:41 +03:00
Dmitriy Kuzmenko
15f02b72ca add email and phone api for establishments 2019-09-13 12:20:36 +03:00
Dmitriy Kuzmenko
10d9b52bec Merge remote-tracking branch 'origin/develop' into feature/backoffice 2019-09-12 18:27:04 +03:00
Dmitriy Kuzmenko
efac785248 add api for estab, social, plates, menu 2019-09-12 18:24:21 +03:00