Commit Graph

25 Commits

Author SHA1 Message Date
littlewolf
cf226974c8 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/collection/models.py
#	apps/location/serializers/common.py
#	apps/location/transfer_data.py
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/serializers/location.py
#	project/settings/base.py
2019-11-13 00:28:49 +03:00
d.kuzmenko
995d55302a Merge branch 'feature/nested-published-features' into 'develop'
Feature/nested published features

See merge request gm/gm-backend!112
2019-11-12 11:57:20 +00:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
Anatoly
c67109d9f8 Merge branch 'develop' into features/migrate-wine
# Conflicts:
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/models.py
#	project/settings/base.py
2019-11-11 11:35:03 +03:00
littlewolf
6d27ac533a Add transfer to city_photos
Add migrations
2019-11-10 16:34:31 +03:00
littlewolf
6a66867cb8 Fix country serializer in city 2019-11-08 10:49:45 +03:00
littlewolf
1c8e08fab1 Fix location city gallery 2019-11-08 01:50:55 +03:00
Kuroshini
bf301d21bb Fix tests 2019-11-07 18:25:04 +03:00
littlewolf
086b26e6d9 Add endpoints to gallery 2019-11-07 15:35:06 +03:00
littlewolf
03fc4a6c56 Add city gallery list view 2019-11-07 14:07:19 +03:00
littlewolf
99e2f30499 Merge branch 'develop' into feature/add-city-endpoints 2019-11-07 10:44:54 +03:00
littlewolf
57d22bedcb Add gallery
Add name_translated
Add migrations
2019-11-06 22:56:41 +03:00
evgeniy-st
e21a8bb550 Added country serializer to AddressDetailSerializer 2019-11-06 16:02:12 +03:00
littlewolf
e6094b7961 Fix RUD
Remove Create Serializer
2019-11-06 09:03:48 +03:00
littlewolf
a5b8b0cdb1 Fix fields 2019-11-05 14:35:11 +03:00
littlewolf
f8669ad3ca Add city create 2019-11-05 14:14:38 +03:00
Anatoly
5d43e2fd5b refactor models 2019-10-31 18:44:30 +03:00
Anatoly
d12df5c8e1 added WineAppellation model 2019-10-28 12:33:48 +03:00
Anatoly
e41b539ed7 added wine region 2019-10-27 18:42:51 +03:00
evgeniy-st
e42f4d061c refactor address 2019-10-01 18:07:04 +03:00
Kuroshini
d71ed0c1de Fix lot/lat x/y mapping && address serialization 2019-09-27 19:44:00 +03:00
evgeniy-st
f18c18110c Refactor some establishment serializer 2019-09-25 15:32:45 +03:00
evgeniy-st
dc4b63d8b2 Refactor news 2019-09-23 15:35:37 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Dmitriy Kuzmenko
e9bf129f82 add api locations for back office 2019-09-18 11:39:46 +03:00