Commit Graph

355 Commits

Author SHA1 Message Date
Kuroshini
39c8f6d152 remove carousel hardcode 2019-12-11 15:47:08 +03:00
Kuroshini
4010c9fede News multilang slugs (model && views) 2019-12-10 19:16:19 +03:00
Kuroshini
b5a113c875 user last visit middleware 2019-12-06 18:53:40 +03:00
Dmitriy Kuzmenko
831cb4bc81 add home_page 2019-12-06 18:17:16 +03:00
Anatoly
c272dc1255 increase JWT token lifetime 2019-12-06 13:15:35 +03:00
Kuroshini
7635eafb09 booking urls for mobile
(cherry picked from commit 0df3425)
2019-12-06 13:11:58 +03:00
Anatoly
1da7c40a9d fix merge 2019-12-04 20:18:47 +03:00
Anatoly
9dc8e34e3a Merge branch 'develop' into feature/transfer-guide
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/serializers/common.py
2019-12-04 20:16:21 +03:00
Anatoly
627f7562ec finalizing transfer guides 2019-12-04 14:21:54 +03:00
Kuroshini
9f882ca656 tags dynamic filters #4 (boost search via ES) 2019-12-04 00:33:18 +03:00
Dmitriy Kuzmenko
b6d0815ed0 add news author migration 2019-12-03 09:59:11 +03:00
Anatoly
52872ce364 updated 2019-11-29 14:09:00 +03:00
Kuroshini
c769049160 Email layout. Redirect to main from logo 2019-11-29 13:01:38 +03:00
Виктор Гладких
420c673afd Fix 2019-11-25 16:52:27 +03:00
Kuroshini
a660ffcc31 static to Amazon #2 2019-11-25 14:26:37 +03:00
Kuroshini
49c6dc8f1d static to Amazon 2019-11-25 14:21:05 +03:00
Anatoly
9b61ff3114 added COOKIE_DOMAIN parameter to settings 2019-11-23 14:58:49 +03:00
Dmitriy Kuzmenko
4fdc32ea04 Merge branch 'feature/crop-params' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/crop-params 2019-11-22 19:21:28 +03:00
Dmitriy Kuzmenko
797327802b Merge remote-tracking branch 'origin/develop' into feature/crop-params 2019-11-22 19:21:16 +03:00
Anatoly
65bb22bb21 reassign sorl-thumbnail engine 2019-11-22 19:04:47 +03:00
Dmitriy Kuzmenko
193a7ae29d Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-22 18:34:01 +03:00
Dmitriy Kuzmenko
c83c07b9e1 add site features inline admin 2019-11-22 18:33:39 +03:00
Kuroshini
586f2a7a03 boost detail establishment speed
(cherry picked from commit c2bb9f0)
2019-11-22 18:22:41 +03:00
Kuroshini
c2bb9f0814 boost detail establishment speed 2019-11-22 18:21:37 +03:00
evgeniy-st
99f01464b7 Merge branch 'develop' into feature/crop-params 2019-11-22 16:08:42 +03:00
evgeniy-st
f95a082db3 update geoip feature 2019-11-22 16:00:06 +03:00
Виктор Гладких
e0352b7d93 Back news permissions 2019-11-22 15:46:59 +03:00
Anatoly
f7703f18b0 refactored upload image endpoint 2019-11-22 13:02:04 +03:00
evgeniy-st
ce41b96ec3 update dev settings 2019-11-22 12:34:11 +03:00
alex
d30d68bf17 partner test 2019-11-22 10:32:01 +03:00
evgeniy-st
04d6412f39 Merge branch 'develop' into feature/in_favorites 2019-11-21 18:18:09 +03:00
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +03:00
Kuroshini
8e215b2555 Demonstration carousel item 2019-11-21 16:40:53 +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
alex
45fee0355c Merge remote-tracking branch 'origin/develop' into develop 2019-11-20 16:38:22 +03:00
alex
824cbe203b award back api 2019-11-20 16:38:11 +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
Anatoly
d0fec2591f added bo endpoints for ads 2019-11-18 12:48:39 +03:00