Commit Graph

71 Commits

Author SHA1 Message Date
Kuroshini
9781014626 sort by modified_at 2020-02-10 14:25:33 +03:00
Kuroshini
bf0a0b42a9 some fixes & migrations 2020-02-03 17:56:05 +03:00
dormantman
a544810cac Alter location field 2020-01-31 19:10:40 +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
dormantman
191c168c99 Added migrations 2020-01-28 15:49:50 +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
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
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
80759c24e7 Fix number 2019-12-20 13:19:56 +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
d330aa5205 refactoring 2019-12-09 13:34:17 +03:00
littlewolf
943dce90c7 Add migration 2019-12-09 12:17:41 +03:00
littlewolf
1e0201b950 Add merge 2019-12-09 11:33:14 +03:00
littlewolf
c480089f30 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	_dockerfiles/db/Dockerfile
#	apps/transfer/management/commands/transfer.py
#	docker-compose.mysql.yml
#	project/settings/local.py
2019-12-09 10:41:01 +03:00
Anatoly
29ff10fb4b added wine origins 2019-12-04 20:13:09 +03:00
littlewolf
b63809c987 Add migrations 2019-11-21 15:41:35 +03:00
littlewolf
470bd096b0 Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
#	apps/location/models.py
#	apps/location/transfer_data.py
#	apps/location/views/common.py
#	apps/transfer/management/commands/transfer.py
#	project/settings/local.py
2019-11-21 14:43:30 +03:00
Anatoly
ef1af8c3ac added city gallery 2019-11-20 13:27:26 +03:00
a.feteleu
d932df4392 add unknown migrations from developm server:-( 2019-11-20 10:07:23 +03:00
alex
267544a0b1 merge for migration 2019-11-19 09:48:25 +03:00
Anatoly
0d9d45bcc5 added model Product and bo endpoints 2019-11-18 17:58:46 +03:00
alex
dc0b4ce107 fix collection establishment in_fav 2019-11-18 13:12:24 +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
Dmitriy Kuzmenko
141bddc0db add active flag for languages and Countries 2019-11-14 22:54:27 +03:00
Anatoly
688bc851bb fixed product related tags 2019-11-14 12:39:09 +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
Dmitriy Kuzmenko
359deeeb39 fix model currency 2019-11-12 04:06:28 +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
littlewolf
ec07ba74da Add migrations 2019-11-08 09:51:30 +03:00
littlewolf
0b68cb3420 Add gallery relation to location.city 2019-11-07 11:49:10 +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
Anatoly
87dacfec7f refactored product app, see changes 2019-11-05 18:04:34 +03:00
Anatoly
4a38bec2a7 added migrations and added migration wine colors 2019-11-01 16:48:49 +03:00
alex
7e503f617e merge migrations 2019-10-30 20:15:19 +03:00
alex
962d24f737 Merge branch 'migration_fix' into develop
# Conflicts:
#	apps/establishment/admin.py
#	apps/transfer/models.py
2019-10-30 20:04:02 +03:00
a.feteleu
d31bb9b495 merge migrations 2019-10-30 19:19:40 +03:00
Dmitriy Kuzmenko
638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
#	apps/establishment/admin.py
#	project/settings/base.py
2019-10-30 19:12:59 +03:00
evgeniy-st
00bcd6c205 added merge migrations 2019-10-30 11:59:19 +03:00
evgeniy-st
e371fdceea Merge branch 'develop' into migration_fix 2019-10-30 11:50:30 +03:00
Anatoly
65e7c965e4 added migrations 2019-10-28 12:46:10 +03:00
littlewolf
3622ac22b9 Add migrations 2019-10-28 10:13:43 +03:00