Commit Graph

279 Commits

Author SHA1 Message Date
alex
2a9ef2c704 refactor location transfer 1 2020-02-03 16:57:00 +03:00
Anatoly
227b3746ca fix city transfer 2020-02-03 11:03:38 +03:00
dormantman
a544810cac Alter location field 2020-01-31 19:10:40 +03:00
dormantman
b309d69079 Alter serializer location field 2020-01-31 15:44:44 +03:00
Anatoly
b518faaf8b added DEFAULT_CALLING_CODE_ANTILLES_GUYANE_WEST_INDIES param, refactored serializers 2020-01-31 14:52:35 +03:00
Anatoly
421ec5c73c refactored serializer 2020-01-31 13:50:42 +03:00
Anatoly
08831de43a refactored a little 2020-01-31 13:43:44 +03:00
Anatoly
095cc2cb91 fix 2020-01-31 13:38:07 +03:00
Anatoly
fb1eee3e4c added hardcoded calling number for Antilles Guyane West Indies islands 2020-01-31 13:36:41 +03:00
Anatoly
ced3abe3cf added command to set the calling code for countries, modified setup_clean_db transfer, modified serializers 2020-01-30 17:57:53 +03:00
Anatoly
21b0786daf fix city model 2020-01-30 13:11:19 +03:00
Anatoly
25c63b8097 Merge branch 'develop' into feature/roles
# Conflicts:
#	apps/account/models.py
#	apps/collection/views/back.py
#	apps/comment/views/back.py
#	apps/establishment/models.py
#	apps/establishment/views/back.py
#	apps/news/views.py
#	apps/partner/views/back.py
2020-01-30 10:56:46 +03:00
Anatoly
57e63111fb intermediate commit 2020-01-30 10:28:01 +03:00
Anatoly
302e22045e fixes 2020-01-29 16:59:16 +03:00
dormantman
191c168c99 Added migrations 2020-01-28 15:49:50 +03:00
dormantman
56b5af1291 Added district_name field 2020-01-28 15:49:00 +03:00
dormantman
e89f04dee4 Added serializer parent region 2020-01-28 14:44:54 +03:00
Kuroshini
029cd36b98 localized cities #7 2020-01-28 12:35:30 +03:00
Kuroshini
5c75b0a3ac localized cities #5 2020-01-27 23:24:01 +03:00
Kuroshini
faeec9b4f2 localized cities #4 2020-01-27 23:22:53 +03:00
Kuroshini
e1b2c74988 localized cities #3 2020-01-27 23:19:25 +03:00
Kuroshini
ff34d66854 localized cities #2 2020-01-27 23:15:48 +03:00
Kuroshini
468527bc0e localized cities #1 2020-01-27 23:13:22 +03:00
Kuroshini
f5da5f71a3 base related qs for cities 2020-01-27 18:45:23 +03:00
Kuroshini
cd0317d94d image for city is not longer required field 2020-01-24 15:48:02 +03:00
a.gorbunov
1d8d18d4de added order field 2020-01-23 17:54:18 +00:00
Kuroshini
6d2aee572a fix configs 2020-01-23 18:02:26 +03:00
a.gorbunov
749775075c fix sort 2020-01-22 14:57:37 +00:00
Kuroshini
5a662fd745 Image id on city creation 2020-01-20 13:18:49 +03:00
Anatoly
59c9c06d64 fix transfer location 2020-01-15 16:46:12 +03:00
Anatoly
8f206f2a9c remove city gallery 2020-01-15 14:20:51 +03:00
Anatoly
8cb0f51802 fix transfer command transfer_city_gallery, add field image to City model, fix serializer CityDetailSerializer 2020-01-15 13:22:54 +03:00
d.kuzmenko
700d8b5286 Merge branch 'feature/fix-location-sort' into 'develop'
Add order

See merge request gm/gm-backend!189
2019-12-30 07:45:00 +00:00
Dmitriy Kuzmenko
e2d71fca8f Merge branch 'develop' into feature/guides 2019-12-27 18:00:20 +03:00
Anatoly
b41c185a65 see changes 2019-12-27 14:46:36 +03:00
Kuroshini
7648e478f5 allow city main image changing 2019-12-26 15:00:05 +03:00
littlewolf
2651ad1a29 Add order 2019-12-26 14:19:26 +03:00
littlewolf
670da807af Fix fake country flag 2019-12-24 14:10:47 +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
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
littlewolf
56309f2a10 Update fake country flag 2019-12-23 13:14:48 +03:00
Anatoly
cc7125b468 added image url to es 2019-12-23 09:19:16 +03:00
littlewolf
215f36eb9b Add unused subregions 2019-12-20 19:35:59 +03:00
littlewolf
769a71b5eb Fix 2019-12-20 13:52:20 +03:00
littlewolf
80759c24e7 Fix number 2019-12-20 13:19:56 +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
littlewolf
819e4366f7 Fix locatioin
Add decorator to log
2019-12-20 11:52:40 +03:00