michail
|
09e0a36313
|
added image url to partner model
|
2019-11-01 17:08:53 +05: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 |
|
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 |
|
alex
|
e68e33859d
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/feature/migration
|
2019-10-29 12:31:32 +03:00 |
|
littlewolf
|
72c6545a34
|
Add old_id to account_user
|
2019-10-29 11:30:33 +03:00 |
|
michail
|
7613ece6f8
|
new fix notification.py
|
2019-10-29 13:09:13 +05:00 |
|
michail
|
4a9361e04f
|
fix notification.py
|
2019-10-29 12:50:05 +05:00 |
|
alex
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +03:00 |
|
alex
|
c15b5976fb
|
fix ruby schedules
|
2019-10-28 17:07:32 +03:00 |
|
alex
|
4e0f3c9a4d
|
with address
|
2019-10-28 10:59:28 +03:00 |
|
alex
|
49dbc9c72e
|
Merge remote-tracking branch 'origin/migrate-location-app' into origin/feature/migrate-etablishment
|
2019-10-28 10:22:33 +03:00 |
|
littlewolf
|
7d556df8d5
|
Add address serializer
|
2019-10-28 10:13:01 +03:00 |
|
alex
|
281d57996e
|
fix null timezone
|
2019-10-28 09:24:56 +03:00 |
|
littlewolf
|
25d58a8bc5
|
Fix and add city transfer
|
2019-10-28 07:19:17 +03:00 |
|
littlewolf
|
255b1ad5f1
|
Fix queryset conditions
|
2019-10-28 00:15:37 +03:00 |
|
littlewolf
|
0d30543664
|
Fix regions with subregions
|
2019-10-27 21:43:34 +03:00 |
|
littlewolf
|
07f226604e
|
Fix regions without subregion
|
2019-10-27 20:31:41 +03:00 |
|