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 |
|
Anatoly
|
36834835cd
|
added filters to location views
|
2019-12-20 11:05:02 +03:00 |
|
alex
|
4ce01e5740
|
rm code field from city serializer
|
2019-12-19 13:08:26 +03:00 |
|
alex
|
80dce51db2
|
country filter in region and country_code in cities
|
2019-12-18 15:55:05 +03:00 |
|
Anatoly
|
471239983e
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/views/back.py
# apps/transfer/models.py
|
2019-12-17 14:47:26 +03:00 |
|
Anatoly
|
f861aa419c
|
refactored transfer location serializers
|
2019-12-16 17:47:01 +03:00 |
|
littlewolf
|
4c27ad5d5a
|
Fix location address transfer
|
2019-12-16 15:37:29 +03:00 |
|
littlewolf
|
f542403b96
|
Fix country
|
2019-12-16 14:48:55 +03:00 |
|
littlewolf
|
1841da0097
|
Fix ruby cities
Fix transfer order
|
2019-12-16 14:48:55 +03:00 |
|
Anatoly
|
956aae281f
|
refactored fix duplicates
|
2019-12-16 13:46:52 +03:00 |
|
littlewolf
|
ade2d03402
|
Fix ruby_data
|
2019-12-13 17:16:10 +03:00 |
|
littlewolf
|
eb514c0ce2
|
Add clean db setup
|
2019-12-13 12:16:02 +03:00 |
|
Anatoly
|
8ca8c73b4b
|
fix get_ruby_data
|
2019-12-12 17:15:08 +03:00 |
|
Anatoly
|
5fe8273379
|
fix incorrect removal of uniqueness constraint code field
|
2019-12-12 12:48:20 +03:00 |
|
Anatoly
|
ea2eb666d4
|
fix incorrect removal of uniqueness constraint code field
|
2019-12-12 12:40:07 +03:00 |
|
Anatoly
|
28bf782731
|
update method to remove city duplicates
|
2019-12-12 11:17:59 +03:00 |
|
Anatoly
|
3dfd674aa4
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-12 10:51:03 +03:00 |
|
Anatoly
|
1b7c83899a
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-11 15:01:17 +03:00 |
|
Anatoly
|
3bbd76a4f8
|
added endpoints
|
2019-12-10 18:50:12 +03:00 |
|
Anatoly
|
7d40471084
|
intermediate commit
|
2019-12-10 17:44:29 +03:00 |
|
littlewolf
|
68aafe75c0
|
Fix
|
2019-12-10 17:41:13 +03:00 |
|
littlewolf
|
323c2628e0
|
Add endpoint to get all cities with search string
|
2019-12-10 10:17:58 +03:00 |
|
littlewolf
|
814807c564
|
Fix update_city_info
|
2019-12-09 21:15:55 +03:00 |
|
Anatoly
|
d330aa5205
|
refactoring
|
2019-12-09 13:34:17 +03:00 |
|
littlewolf
|
943dce90c7
|
Add migration
|
2019-12-09 12:17:41 +03:00 |
|
Dmitriy Kuzmenko
|
dfe4ab92a6
|
Merge remote-tracking branch 'origin/develop' into feature/add-city-search
# Conflicts:
# _dockerfiles/db/Dockerfile
# project/settings/local.py
|
2019-12-09 11:41:02 +03:00 |
|