Commit Graph

185 Commits

Author SHA1 Message Date
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +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
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Kuroshini
153ccd7bd9 International news 2019-11-15 18:25:40 +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
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
evgeniy-st
b02ccb3b08 Bcrypt support 2019-11-08 16:12:43 +03:00
Anatoly
0b4282bd2f disable session authentication class 2019-11-07 10:55:46 +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
Kuroshini
9d087b53ee Hardcode for presentation 2019-11-04 18:18:46 +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
littlewolf
be464c3651 Fix db 2019-11-01 08:12:07 +03:00
evgeniy-st
30a58473c3 using a fallback language for translation 2019-10-31 16:11:46 +03:00
littlewolf
20785770e1 Add transfer_language 2019-10-31 10:05:39 +03:00
littlewolf
79fda63d7c Fix db 2019-10-31 08:51:13 +03:00
littlewolf
f259319ade Fix exception 2019-10-31 08:42:52 +03:00
littlewolf
c08e202f64 Fix db 2019-10-31 07:46:29 +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
Dmitriy Kuzmenko
1bbe481a39 add settings for phone 2019-10-31 00:16:33 +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
littlewolf
a67df32086 Fix establishment_mark 2019-10-30 12:55:44 +03:00
evgeniy-st
e371fdceea Merge branch 'develop' into migration_fix 2019-10-30 11:50:30 +03:00
alex
adcc43309b fix settings 2019-10-29 08:26:52 +03:00
alex
4e868c2d8d transfer dishes 2019-10-29 08:25:03 +03:00
Dmitriy Kuzmenko
853b0e047e add settings for dev server 2019-10-28 11:41:47 +03:00
Anatoly
37d745eeaa added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype 2019-10-26 18:54:22 +03:00
Anatoly
e3616ee7f8 change news_preview geometry string on 300x2260 2019-10-25 17:32:25 +03:00
Kuroshini
dd0b595132 Review fixes 2019-10-25 14:13:19 +03:00
Kuroshini
7f23f0e891 Establishment each hour reindexing 2019-10-25 14:13:19 +03:00