Commit Graph

170 Commits

Author SHA1 Message Date
littlewolf
70ec095b12 Add location.address correction function 2019-11-18 16:31:04 +03:00
littlewolf
78538bcb76 Add ruby data file 2019-11-18 07:00:52 +03:00
littlewolf
180daeca0c Add ruby data getter
Add ruby files write
Add models migrations
REMOVE UNIQUE FROM location.country.code
Add function to save correct original objects from old database
2019-11-18 06:37:30 +03:00
littlewolf
6bac3fc9c2 Add fields 2019-11-16 14:58:22 +03:00
littlewolf
cf7cc9bd0c Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/serializers/location.py
2019-11-15 17:08:51 +03:00
littlewolf
c2649324e9 Tmp 2019-11-15 17:05:30 +03:00
Dmitriy Kuzmenko
141bddc0db add active flag for languages and Countries 2019-11-14 22:54:27 +03:00
littlewolf
c872cdd4bc Add child_region updater 2019-11-14 15:21:53 +03:00
Anatoly
688bc851bb fixed product related tags 2019-11-14 12:39:09 +03:00
Kuroshini
a91ba7e6f3 Indexing products is ready 2019-11-13 18:43:30 +03:00
Anatoly
3641d88a05 fixed admin pages for product 2019-11-13 17:33:19 +03:00
Anatoly
b56829accc added command add_cepage_tag_category to link cepage tag category with wine region 2019-11-13 16:30:30 +03:00
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
littlewolf
07499c7b3f Tmp fix 2019-11-13 00:19:47 +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
Dmitriy Kuzmenko
359deeeb39 fix model currency 2019-11-12 04:06:28 +03: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
Anatoly
13228ec85a finalizing 2019-11-11 11:33:20 +03:00
littlewolf
6d27ac533a Add transfer to city_photos
Add migrations
2019-11-10 16:34:31 +03:00
Anatoly
efb468f00d added migrator, refactored migrators 2019-11-09 22:58:34 +03:00
littlewolf
48d9ce37f7 Merge branch 'feature/add-city-endpoints' into feature/migrate-city-photos 2019-11-08 14:15:34 +03:00
Semyon Yekhmenin
d9e14194c3 Removed pagination from back regions list view 2019-11-08 10:54:50 +00:00
littlewolf
6a66867cb8 Fix country serializer in city 2019-11-08 10:49:45 +03:00
littlewolf
4cbb8ed291 Add city info migration 2019-11-08 10:25:21 +03:00
littlewolf
ec07ba74da Add migrations 2019-11-08 09:51:30 +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
22ac3d3046 add gallery relation 2019-11-07 11:49:59 +03:00
littlewolf
0b68cb3420 Add gallery relation to location.city 2019-11-07 11:49:10 +03:00
littlewolf
99e2f30499 Merge branch 'develop' into feature/add-city-endpoints 2019-11-07 10:44:54 +03:00
littlewolf
0463afdecb Add fields and migration to location.city 2019-11-07 10:43:08 +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
Anatoly
0aa0378ae0 intermediate commit 2019-11-06 15:35:47 +03:00
littlewolf
e6094b7961 Fix RUD
Remove Create Serializer
2019-11-06 09:03:48 +03:00
Anatoly
87dacfec7f refactored product app, see changes 2019-11-05 18:04:34 +03:00
Anatoly
d46ba31654 Merge branch 'develop' into features/migrate-wine
# Conflicts:
#	apps/product/models.py
#	apps/transfer/management/commands/transfer.py
#	apps/transfer/models.py
2019-11-05 14:56:26 +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
Kuroshini
e69f272a63 Fix time format for frontend 2019-11-02 15:42:33 +03:00
Anatoly
4a38bec2a7 added migrations and added migration wine colors 2019-11-01 16:48:49 +03:00
littlewolf
41e48cb0e9 Merge branch 'feature/fix-country-transfer' into develop 2019-11-01 12:13:11 +03:00
littlewolf
0352615200 Fix country_code svg 2019-11-01 12:12:51 +03:00
evgeniy-st
04afd4d913 update country time_format and __str__ method 2019-11-01 11:34:48 +03:00
d.kuzmenko
03feb13166 Merge branch 'feature/collect' into 'develop'
Feature/collect

See merge request gm/gm-backend!89
2019-11-01 07:36:40 +00:00
e.stoyushko
7c530bb43b Merge branch 'feature/time-format-for-front' into 'develop'
Time format for country

See merge request gm/gm-backend!88
2019-11-01 07:23:49 +00:00
Kuroshini
a8861238ac Time format for country 2019-10-31 19:02:48 +03:00