Commit Graph

128 Commits

Author SHA1 Message Date
Anatoly
8a49a5ee72 added gallery to model product 2019-11-10 16:08:27 +03:00
Anatoly
efb468f00d added migrator, refactored migrators 2019-11-09 22:58:34 +03:00
Anatoly
0f2d1ca071 need checks 2019-11-08 19:46:16 +03:00
Anatoly
9bdeabe352 added tags 2019-11-07 19:03:12 +03:00
Anatoly
0aa0378ae0 intermediate commit 2019-11-06 15:35:47 +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
alex
cc2c475b4e add_establishment_description with elastic error 2019-11-02 22:45:57 +03:00
Dmitriy Kuzmenko
914450e8c2 add translation fix for tag 2019-11-02 19:18:58 +03:00
Anatoly
4e76fc966e added fix link for establishment preview_image 2019-11-01 18:43:48 +03:00
Anatoly
fdd5c0bace added fix link for establishment preview_image, run - ./manage.py transfer --fix_establishment_preview_image 2019-11-01 18:10:53 +03:00
alex
7acc8592a8 country for carousel 2019-11-01 17:37:53 +03:00
Anatoly
4a38bec2a7 added migrations and added migration wine colors 2019-11-01 16:48:49 +03:00
michail
09e0a36313 added image url to partner model 2019-11-01 17:08:53 +05:00
Anatoly
e6f9e388aa intermediate commit 2019-11-01 14:38:29 +03:00
Anatoly
d1113364a9 intermediate commit 2019-11-01 14:09:54 +03:00
Anatoly
78a8a5d699 intermediate commit 2019-11-01 11:53:32 +03:00
alex
383032b2af Merge remote-tracking branch 'origin/develop' into develop 2019-11-01 10:48:56 +03:00
alex
b3bd2a7141 add_establishment_social command 2019-11-01 10:48:46 +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
Виктор Гладких
54f2290bbd exit 2019-11-01 10:16:05 +03:00
alex
4be8582e7c Merge branch 'maigrate-carousel' into develop 2019-11-01 08:44:46 +03:00
alex
68182e837c carousel fin 2019-11-01 08:41:56 +03:00
littlewolf
e2e95256d8 Merge branch 'feature/fix-country-transfer' into develop 2019-11-01 08:11:30 +03:00
alex
3c88d4f1f5 carousel serializer 2019-10-31 18:31:15 +03:00
alex
f237c37840 Merge remote-tracking branch 'origin/develop' into maigrate-carousel 2019-10-31 17:56:15 +03:00
alex
1946bddad2 start carousel 2019-10-31 17:55:19 +03:00
littlewolf
2ae68e60e4 Add flag updates with command python manage.py transfer --update_country_flag 2019-10-31 17:47:31 +03:00
evgeniy-st
b87f21c630 update transfer tz field 2019-10-31 17:34:59 +03:00
littlewolf
c8554772f1 Fix review published_at
Add old_id
Add description to establishment
2019-10-31 10:05:00 +03:00
littlewolf
d1f1337640 Merge branch 'origin/feature/migrate-etablishment' into develop 2019-10-31 08:50:59 +03:00
littlewolf
f259319ade Fix exception 2019-10-31 08:42:52 +03:00
alex
ea5140cc9c fix summary field in news 2019-10-31 08:11:14 +03:00
littlewolf
08ca1dc356 Move addresses to new key 2019-10-31 07:47:45 +03:00
littlewolf
8f18320171 Merge branch 'develop' into origin/feature/migrate-etablishment
# Conflicts:
#	apps/establishment/transfer_data.py
#	apps/transfer/management/commands/transfer.py
2019-10-31 07:44:07 +03:00
alex
e74c32f0cb fix summary 2019-10-30 23:15:40 +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
Dmitriy Kuzmenko
523e3a1ca0 merge work in subtitle 2019-10-30 18:59:16 +03:00
Dmitriy Kuzmenko
03ee9c1279 Merge remote-tracking branch 'origin/origin/migration_fix' into origin/migration_fix
# Conflicts:
#	apps/transfer/serializers/news.py
2019-10-30 18:52:56 +03:00
Dmitriy Kuzmenko
58be2491a5 create command for establishment tags 2019-10-30 18:47:13 +03:00
Виктор Гладких
c1c9f99fb5 Add product migrate data 2019-10-30 18:04:30 +03:00
Виктор Гладких
b74b87d78d Add products model in transfer 2019-10-30 17:23:45 +03:00
alex
8c3306628e news transfer 2019-10-30 15:48:32 +03:00
alex
c521839389 news refactor 2019-10-30 13:53:12 +03:00
littlewolf
f690ad3b8f Fix key 2019-10-30 12:48:04 +03:00
littlewolf
86e0699c8c Add reviews transfer
Add language transfer
Fix comment transfer
2019-10-30 12:31:38 +03:00
littlewolf
9310bff319 Add comment serializer 2019-10-30 12:31:38 +03:00
alex
55bdc7771f add image to establishment 2019-10-29 21:54:03 +03:00
alex
b41ec3eebd add is_publish 2019-10-29 17:16:51 +03:00