Commit Graph

261 Commits

Author SHA1 Message Date
littlewolf
ec8b643c54 Fix db to dump 2019-12-02 15:28:39 +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
littlewolf
8c7b13f025 Fix transfer in project.base 2019-11-21 11:40:24 +03:00
Виктор Гладких
98468f2604 Fix ELASTICSEARCH_DSL_AUTOSYNCOC 2019-11-21 11:16:02 +03:00
Dmitriy Kuzmenko
7b2e8374a0 change settings 2019-11-21 00:45:48 +03:00
Dmitriy Kuzmenko
74c1b7069a fix product tags 2019-11-21 00:23:17 +03:00
Виктор Гладких
a17e83ebe5 On sync elasticsearch 2019-11-20 16:36:37 +03:00
Виктор Гладких
5a55fa82a2 Codestyle 2019-11-20 15:32:36 +03:00
Виктор Гладких
b42b75609a Check elasticsearch dsl autosync 2019-11-20 09:59:23 +03:00
Виктор Гладких
551cb2d5b6 Fix index elastic 2019-11-19 18:43:37 +03:00
alex
0fe7c50e5b logging 2019-11-19 17:50:04 +03:00
alex
a8cc734d20 back user api 2019-11-19 17:48:20 +03:00
Kuroshini
c7033d4b10 Revert "Revert "ES as separate server""
This reverts commit f81e879
2019-11-18 18:09:19 +03:00
Kuroshini
f81e879ae4 Revert "ES as separate server"
This reverts commit 3536be8
2019-11-18 18:03:21 +03:00
Kuroshini
3536be8394 ES as separate server 2019-11-18 18:01:55 +03:00
Kuroshini
2a680311ae Revert "use another ES server"
This reverts commit 89191fc
2019-11-18 17:37:10 +03:00
Kuroshini
89191fcf35 use another ES server 2019-11-18 17:35:16 +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
Kuroshini
a305c6ba83 try to fix tag categories
(cherry picked from commit 376d22c)
2019-11-17 23:44:15 +03:00
Anatoly
dce951c4f9 Merge branch 'develop' into feature/establishment-gallery
# Conflicts:
#	apps/product/serializers/common.py
2019-11-17 14:25:41 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Dmitriy Kuzmenko
b1d176c583 enable elastic 2019-11-16 23:01:22 +03:00
Dmitriy Kuzmenko
45b0b93068 add new migrations for tags 2019-11-16 22:49:38 +03:00
Kuroshini
153ccd7bd9 International news 2019-11-15 18:25:40 +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
littlewolf
c2649324e9 Tmp 2019-11-15 17:05:30 +03:00
Kuroshini
798e58202c Return hardcode for chosen tags 2019-11-15 15:53:26 +03:00
Anatoly
43fba17288 remove transfer app config 2019-11-15 13:02:04 +03:00
Anatoly
1dbd7a6451 refactored advertisements 2019-11-15 13:02:04 +03:00
Dmitriy Kuzmenko
12d44c0a0d enable elastic 2019-11-15 12:18:04 +03:00
Dmitriy Kuzmenko
41c842e224 change review transfer 2019-11-15 12:14:53 +03:00
littlewolf
4e72487558 Add rating.views_count transfer 2019-11-14 20:54:14 +03:00
littlewolf
c872cdd4bc Add child_region updater 2019-11-14 15:21:53 +03:00
e.stoyushko
9545c42a7d Update development.py 2019-11-14 09:12:38 +00:00
Kuroshini
a3b944ed1e New ES index 2019-11-13 18:43: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
Виктор Гладких
13db34237b Add tag for product 2019-11-12 17:36:48 +03:00
Anatoly
5290e33ea7 added preview image crop for model Product 2019-11-12 12:14:45 +03:00
Dmitriy Kuzmenko
2fe56d713d enabled elastic 2019-11-12 04:12:27 +03:00
Dmitriy Kuzmenko
1cd71ad830 disabled elastic 2019-11-11 23:16:32 +03:00
Anatoly
f4b411e73d added tags, image urls to product serializers 2019-11-11 21:29:34 +03:00
Anatoly
358407e786 merged develop 2019-11-11 12:01:16 +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
littlewolf
6d27ac533a Add transfer to city_photos
Add migrations
2019-11-10 16:34:31 +03:00
Dmitriy Kuzmenko
3d83c2a3aa Merge branch 'feature/account_migrate' into develop 2019-11-08 17:04:11 +03:00
evgeniy-st
b02ccb3b08 Bcrypt support 2019-11-08 16:12:43 +03:00
Виктор Гладких
ba6d18d202 Fix account migration 2019-11-07 17:01:26 +03:00
Anatoly
0b4282bd2f disable session authentication class 2019-11-07 10:55:46 +03:00
Dmitriy Kuzmenko
82d238c123 fiz settings 2019-11-06 15:25:59 +03:00
Anatoly
87dacfec7f refactored product app, see changes 2019-11-05 18:04:34 +03:00