littlewolf
|
c8554772f1
|
Fix review published_at
Add old_id
Add description to establishment
|
2019-10-31 10:05:00 +03:00 |
|
alex
|
fea93f50f7
|
fix image_url for establishment
|
2019-10-31 09:40:50 +03:00 |
|
littlewolf
|
79fda63d7c
|
Fix db
|
2019-10-31 08:51:13 +03:00 |
|
littlewolf
|
d1f1337640
|
Merge branch 'origin/feature/migrate-etablishment' into develop
|
2019-10-31 08:50:59 +03:00 |
|
littlewolf
|
11a1928346
|
Add MultipkleObjects exception
|
2019-10-31 08:49:17 +03:00 |
|
littlewolf
|
f259319ade
|
Fix exception
|
2019-10-31 08:42:52 +03:00 |
|
alex
|
9cdb3cca27
|
rm works_now from elastic
|
2019-10-31 08:17:08 +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
|
c08e202f64
|
Fix db
|
2019-10-31 07:46:29 +03:00 |
|
littlewolf
|
d654b093ef
|
Fix
|
2019-10-31 07:44:53 +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 |
|
littlewolf
|
968ae4246b
|
Fix mark
|
2019-10-31 07:37:09 +03:00 |
|
littlewolf
|
b146e6cd24
|
Add establishment address transfer
|
2019-10-31 07:00:44 +03:00 |
|
a.feteleu
|
a4c9c8f0cc
|
fix tags command
|
2019-10-31 02:16:29 +03:00 |
|
Dmitriy Kuzmenko
|
e653e6c7da
|
fix tag command
|
2019-10-31 00:53:01 +03:00 |
|
Dmitriy Kuzmenko
|
1bbe481a39
|
add settings for phone
|
2019-10-31 00:16:33 +03:00 |
|
alex
|
e74c32f0cb
|
fix summary
|
2019-10-30 23:15:40 +03:00 |
|
a.feteleu
|
e75229b4d3
|
fix elastic settings
|
2019-10-30 20:35:15 +03:00 |
|
alex
|
7e503f617e
|
merge migrations
|
2019-10-30 20:15:19 +03:00 |
|
alex
|
d344aeeeef
|
Merge branch 'fix_migrations' into develop
|
2019-10-30 20:04:48 +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 |
|
Anatoly
|
414ad72ed3
|
Revert "modified NewsImageSerializer, in future needs refactoring"
This reverts commit 776b500d
|
2019-10-30 20:01:19 +03:00 |
|
Anatoly
|
776b500d19
|
modified NewsImageSerializer, in future needs refactoring
|
2019-10-30 19:59:12 +03:00 |
|
alex
|
9a5282fbb0
|
Merge branch 'migration_fix' into HEAD
# Conflicts:
# apps/establishment/admin.py
# apps/transfer/models.py
|
2019-10-30 19:58:51 +03:00 |
|
Dmitriy Kuzmenko
|
048b971e78
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-10-30 19:51:48 +03:00 |
|
Dmitriy Kuzmenko
|
aa2759d7e0
|
fix estab tags
|
2019-10-30 19:51:33 +03:00 |
|
a.feteleu
|
d31bb9b495
|
merge migrations
|
2019-10-30 19:19:40 +03:00 |
|
Dmitriy Kuzmenko
|
887bc92b85
|
fix merge
|
2019-10-30 19:17:50 +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 |
|
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 |
|
Виктор Гладких
|
f6151c0a14
|
delete okd_models from product
|
2019-10-30 17:24:40 +03:00 |
|
Виктор Гладких
|
b74b87d78d
|
Add products model in transfer
|
2019-10-30 17:23:45 +03:00 |
|
alex
|
b5d1715063
|
Merge remote-tracking branch 'origin/migration_fix' into migration_fix
|
2019-10-30 15:54:50 +03:00 |
|
alex
|
4343060c74
|
Merge branch 'migration_fix' into HEAD
|
2019-10-30 15:49:32 +03:00 |
|
alex
|
8c3306628e
|
news transfer
|
2019-10-30 15:48:32 +03:00 |
|
e.stoyushko
|
94dcd9c950
|
Merge branch 'feature/schedule-order-id' into 'develop'
Weekday for mobile devices
See merge request gm/gm-backend!85
|
2019-10-30 11:25:59 +00:00 |
|
Anatoly
|
6fcfb263d3
|
fix ProductModelAdmin
|
2019-10-30 14:23:40 +03:00 |
|
Kuroshini
|
42c596b592
|
Weekday for mobile devices
|
2019-10-30 14:19:03 +03:00 |
|
alex
|
c521839389
|
news refactor
|
2019-10-30 13:53:12 +03:00 |
|
littlewolf
|
a67df32086
|
Fix establishment_mark
|
2019-10-30 12:55:44 +03:00 |
|
littlewolf
|
f690ad3b8f
|
Fix key
|
2019-10-30 12:48:04 +03:00 |
|
littlewolf
|
37c3a43932
|
Mv reviews to mention command
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
86e0699c8c
|
Add reviews transfer
Add language transfer
Fix comment transfer
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
c564f4fd67
|
Fix rewiewers
|
2019-10-30 12:31:38 +03:00 |
|
littlewolf
|
9310bff319
|
Add comment serializer
|
2019-10-30 12:31:38 +03:00 |
|
evgeniy-st
|
7805a63055
|
remove establishment document filtering by country code
|
2019-10-30 12:15:40 +03:00 |
|