Commit Graph

95 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
858f64a26a fix product serializer 2019-11-12 03:42:18 +03:00
Dmitriy Kuzmenko
6a5cedc8b9 fix product serializer 2019-11-12 03:41:24 +03:00
Dmitriy Kuzmenko
362070656e fix product serializer 2019-11-12 03:40:09 +03:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
Anatoly
7fcba802c1 fixed tags 2019-11-11 18:52:09 +03:00
Dmitriy Kuzmenko
a7dca6cd78 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/transfer_data.py
2019-11-11 15:32:42 +03:00
Dmitriy Kuzmenko
7617981259 change command for migration of users 2019-11-11 15:29:31 +03:00
Anatoly
0610075706 fixed transfer product with sub type plates 2019-11-11 13:15:37 +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
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
alex
9b16f46215 migrate identities 2019-11-06 15:12:33 +03:00
alex
a372d29677 refactor comment migration 2019-11-06 14:24:14 +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
michail
06f5a551b8 additions for migration of comments 2019-11-05 16:45:43 +05:00
alex
cc2c475b4e add_establishment_description with elastic error 2019-11-02 22:45:57 +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
78a8a5d699 intermediate commit 2019-11-01 11:53:32 +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
68182e837c carousel fin 2019-11-01 08:41:56 +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
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
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
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
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
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
b41ec3eebd add is_publish 2019-10-29 17:16:51 +03:00
alex
f929c096bc add subtitle like a description 2019-10-29 16:42:43 +03:00
alex
dc11fb055f fix news and paris establishments 2019-10-29 12:34:08 +03:00