a.gorbunov
|
7bc998ca94
|
fix regex for find images
|
2020-01-15 06:57:59 +00:00 |
|
a.gorbunov
|
210070b7cf
|
fix regex for find images
|
2020-01-15 06:45:42 +00:00 |
|
Kuroshini
|
24f0c25a3d
|
Merge branch 'feature/auto-username' into develop
# Conflicts:
# apps/utils/methods.py
|
2020-01-14 22:01:57 +03:00 |
|
dormantman
|
42190e0e28
|
Fix for front auth
|
2020-01-14 21:57:57 +03:00 |
|
dormantman
|
d2c03b0f37
|
Merge remote-tracking branch 'origin/feature/auto-username' into develop
|
2020-01-14 21:17:17 +03:00 |
|
dormantman
|
49673d64af
|
Added automatic username creation
|
2020-01-14 18:20:57 +03:00 |
|
a.gorbunov
|
c110dc3b96
|
optimize collection images
|
2020-01-14 18:18:17 +03:00 |
|
Kuroshini
|
3f19699e1d
|
supress issues w/ news images compression
|
2020-01-14 17:32:13 +03:00 |
|
a.gorbunov
|
710eb274ed
|
remove debug info. Cleanup code. Set default quality
|
2020-01-14 17:17:55 +03:00 |
|
Kuroshini
|
77cca6c6d7
|
resize photos
|
2020-01-14 17:17:55 +03:00 |
|
a.gorbunov
|
ba4c6901f9
|
quality calculate
|
2020-01-14 17:17:55 +03:00 |
|
a.gorbunov
|
e70e1d0a67
|
thumbnail alias for images in news description
|
2020-01-14 17:17:55 +03:00 |
|
anton
|
0672bcaef9
|
command for optimize news images
|
2020-01-14 17:17:55 +03:00 |
|
alex
|
989e9f9465
|
last country
|
2020-01-10 15:57:36 +03:00 |
|
alex
|
6ad4e0d46f
|
last_ip
|
2020-01-10 14:27:00 +03:00 |
|
Anatoly
|
75e4077917
|
refactored structure of XML-document
|
2020-01-10 13:06:17 +03:00 |
|
Anatoly
|
963e0597dc
|
set username as non-required field on registration stage
(https://dev-krd.atlassian.net/browse/GM-304)
|
2020-01-09 17:57:10 +03:00 |
|
Anatoly
|
b457ffe975
|
small changes
|
2020-01-09 14:59:29 +03:00 |
|
Anatoly
|
d3c723eb43
|
intermediate commit
|
2019-12-30 19:07:06 +03:00 |
|
Anatoly
|
1468e5cdde
|
intermediate commit
|
2019-12-30 18:15:55 +03:00 |
|
Anatoly
|
2827374911
|
intermediate commit
|
2019-12-30 13:22:57 +03:00 |
|
Dmitriy Kuzmenko
|
e2d71fca8f
|
Merge branch 'develop' into feature/guides
|
2019-12-27 18:00:20 +03:00 |
|
Dmitriy Kuzmenko
|
ccd9f717df
|
Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
# apps/utils/export.py
|
2019-12-27 17:59:20 +03:00 |
|
Dmitriy Kuzmenko
|
d09776c8fa
|
add xml
|
2019-12-27 17:57:16 +03:00 |
|
Anatoly
|
151c017561
|
see changes
|
2019-12-27 17:49:56 +03:00 |
|
Anatoly
|
f42f571053
|
see changes
|
2019-12-27 15:59:15 +03:00 |
|
Anatoly
|
b41c185a65
|
see changes
|
2019-12-27 14:46:36 +03:00 |
|
alex
|
b958e0b597
|
preview_image fix
|
2019-12-27 11:16:38 +03:00 |
|
alex
|
e3d7618c62
|
preview_image to establishment and product type and subtype
|
2019-12-27 09:47:48 +03:00 |
|
Dmitriy Kuzmenko
|
02d0112d8b
|
add export for guides
|
2019-12-26 18:11:48 +03:00 |
|
Anatoly
|
d9df886b98
|
added guide type field, added tasks, refactored GuideElement model, added endpoint,
|
2019-12-25 22:14:35 +03:00 |
|
Anatoly
|
65746b1cd0
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/models.py
|
2019-12-24 12:33:39 +03:00 |
|
Anatoly
|
858b6f3544
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/serializers/news.py
# apps/utils/models.py
|
2019-12-24 12:10:16 +03:00 |
|
d.kuzmenko
|
6a68042178
|
Merge branch 'feature/permission_liquor' into 'develop'
Feature/permission liquor
See merge request gm/gm-backend!175
|
2019-12-23 13:40:13 +00:00 |
|
alex
|
1c04703c77
|
fix test and news type
|
2019-12-23 15:39:54 +03:00 |
|
Anatoly
|
f576825a71
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/models.py
# apps/establishment/models.py
# apps/establishment/views/web.py
# apps/product/views/common.py
# requirements/base.txt
|
2019-12-23 13:11:05 +03:00 |
|
Anatoly
|
7452f0bef0
|
intermediate commit
|
2019-12-23 12:38:13 +03:00 |
|
Anatoly
|
a6bcbdddc1
|
fix es image url
|
2019-12-23 09:44:29 +03:00 |
|
Anatoly
|
cc7125b468
|
added image url to es
|
2019-12-23 09:19:16 +03:00 |
|
Dmitriy Kuzmenko
|
f565e188f1
|
Merge branch 'panels' into develop
|
2019-12-22 20:34:29 +03:00 |
|
Dmitriy Kuzmenko
|
f010c97433
|
add export for panel
|
2019-12-22 20:33:51 +03:00 |
|
Kuroshini
|
660c8e791b
|
tags translation
|
2019-12-20 19:08:53 +03:00 |
|
Kuroshini
|
d1699e001e
|
tag models translations in interface dictionary
|
2019-12-20 18:01:52 +03:00 |
|
littlewolf
|
3dd76503a5
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/management/commands/transfer.py
|
2019-12-20 11:55:23 +03:00 |
|
Dmitriy Kuzmenko
|
847412bb2f
|
Merge branch 'develop' into panels
# Conflicts:
# apps/main/admin.py
|
2019-12-19 19:09:49 +03:00 |
|
Dmitriy Kuzmenko
|
a1f06fd0b9
|
panels executor
|
2019-12-19 19:07:23 +03:00 |
|
Виктор Гладких
|
eaefae399d
|
Fix est_type.id
|
2019-12-17 17:52:54 +03:00 |
|
Виктор Гладких
|
1d8b707c3c
|
Fix est_type.id
|
2019-12-17 17:51:56 +03:00 |
|
Kuroshini
|
22aefc2f83
|
description is_active logic
|
2019-12-17 17:34:20 +03:00 |
|
Kuroshini
|
900846951e
|
localized description
|
2019-12-17 16:09:03 +03:00 |
|