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 |
|
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 |
|
Виктор Гладких
|
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 |
|
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 |
|
Виктор Гладких
|
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 |
|
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 |
|
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 |
|
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 |
|
Виктор Гладких
|
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 |
|
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 |
|
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 |
|