Commit Graph

238 Commits

Author SHA1 Message Date
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
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
d.kuzmenko
19fb746356 Merge branch 'feature/remove-presentation-crunches' into 'develop'
Remove all crunches from projects

See merge request gm/gm-backend!100
2019-11-05 14:21:16 +00:00
michail
06f5a551b8 additions for migration of comments 2019-11-05 16:45:43 +05:00
Kuroshini
f52847a71a Remove all crunches from projects 2019-11-05 14:29:53 +03:00
Dmitriy Kuzmenko
210e4d39f1 disabled debug 2019-11-04 18:58:21 +03:00
Kuroshini
9d087b53ee Hardcode for presentation 2019-11-04 18:18:46 +03:00
Dmitriy Kuzmenko
f1d22c2392 redis for prod 2019-11-04 17:32:22 +03:00
Dmitriy Kuzmenko
fd926ee486 old id for prod 2019-11-04 17:15:33 +03:00
Dmitriy Kuzmenko
24305b53c2 Merge branch 'amazon' into develop 2019-11-04 17:12:30 +03:00
Kuroshini
fcef8b3e2b New hardcoded old ids 2019-11-04 17:09:19 +03:00
Dmitriy Kuzmenko
6422fc09f9 elc 2019-11-04 16:20:10 +03:00
Kuroshini
28c46a593a Revert "Production settings"
This reverts commit d493c5f
2019-11-04 16:19:08 +03:00
Kuroshini
d493c5f14c Production settings 2019-11-04 16:13:47 +03:00
Dmitriy Kuzmenko
b92703224d Merge branch 'develop' into amazon 2019-11-04 14:12:21 +03:00
d.kuzmenko
7c905b2125 Merge branch 'feature/chosen-tags-hardcode' into 'develop'
hardcoded new tags

See merge request gm/gm-backend!97
2019-11-04 11:07:36 +00:00
Kuroshini
f554b13083 hardcoded new tags 2019-11-04 14:00:30 +03:00
Dmitriy Kuzmenko
4405f317e8 release 1 2019-11-04 13:08:22 +03:00
d.kuzmenko
3abb74d19e Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Temp crunch for chosen tags

See merge request gm/gm-backend!96
2019-11-04 08:58:41 +00:00
a.feteleu
739923de97 change fb authentication credentials 2019-11-04 10:22:48 +03:00
Kuroshini
b8fe50f806 Temp crunch for chosen tags 2019-11-03 22:45:44 +03:00
a.feteleu
a36e05d96f added csrf trust origins 2019-11-01 15:56:51 +03:00
Dmitriy Kuzmenko
11f091c069 fix develop settings 2019-11-01 12:36:53 +03:00
Dmitriy Kuzmenko
8d8cd09d64 fix develop settings 2019-11-01 12:32:48 +03:00
Dmitriy Kuzmenko
e4c9d8f9bc fix develop settings 2019-11-01 12:30:07 +03:00