a.gorbunov
|
f09b5c2367
|
fix condition for optimize establishment preview image
|
2020-01-16 07:29:36 +00:00 |
|
a.gorbunov
|
78da617682
|
fix optimize establishment preview images
|
2020-01-16 07:13:31 +00:00 |
|
a.gorbunov
|
e6dec3a1f0
|
fix optimize establishment preview images
|
2020-01-16 06:51:39 +00:00 |
|
alex
|
19b9e636c1
|
phones for cascade establishment
|
2020-01-15 09:20:09 +03:00 |
|
alex
|
0cf62353be
|
fix role field
|
2020-01-14 22:06:53 +03:00 |
|
alex
|
9bd40b0191
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-14 22:04:25 +03:00 |
|
alex
|
1c4e141383
|
fix import error for role serializer
|
2020-01-14 22:04:11 +03: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 |
|
Kuroshini
|
2492000ae6
|
try to fix issue w/ filters
|
2020-01-14 21:30:21 +03:00 |
|
Kuroshini
|
da9f393a52
|
try to fix issue w/ filters
|
2020-01-14 21:28:29 +03:00 |
|
dormantman
|
d2c03b0f37
|
Merge remote-tracking branch 'origin/feature/auto-username' into develop
|
2020-01-14 21:17:17 +03:00 |
|
Anatoly
|
6541070d1c
|
Merge branch 'develop' into feature/navigation-bar
# Conflicts:
# apps/main/serializers.py
|
2020-01-14 19:06:59 +03:00 |
|
Anatoly
|
5c95c4923f
|
refactored roles, refactored response for User detail view
|
2020-01-14 18:40:30 +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
|
440a263ea5
|
verbose news optimize command fix
|
2020-01-14 17:34:33 +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 |
|
Олег Хаятов
|
b2d70ddbf0
|
Merge branch 'bug/similar_products' into 'develop'
fix sort by product type
See merge request gm/gm-backend!205
|
2020-01-14 14:06:09 +00:00 |
|
a.gorbunov
|
7c9d9e8ed1
|
filter by location
|
2020-01-14 13:51:01 +00:00 |
|
a.gorbunov
|
9edd3fef18
|
cleanup code
|
2020-01-14 13:48:55 +00:00 |
|
a.gorbunov
|
5e5d2832cd
|
fix sort by product type
|
2020-01-14 13:39:25 +00:00 |
|
Dmitriy Kuzmenko
|
9aeedff81e
|
Merge branch 'develop' into phone_list
|
2020-01-14 15:59:46 +03:00 |
|
Dmitriy Kuzmenko
|
b5eb5e89b8
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-01-14 15:41:13 +03:00 |
|
Dmitriy Kuzmenko
|
11b55e9f4c
|
change chosen tag functional
|
2020-01-14 15:40:49 +03:00 |
|
Kuroshini
|
1ed384ded2
|
fix issue w/ tags translations
|
2020-01-14 14:44:15 +03:00 |
|
Dmitriy Kuzmenko
|
bc1a9ac496
|
add merge migrations
|
2020-01-14 10:56:49 +03:00 |
|
Dmitriy Kuzmenko
|
387f96b8bf
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-01-14 10:53:53 +03:00 |
|
Dmitriy Kuzmenko
|
fb00c7c3a3
|
add chosen tag
|
2020-01-14 10:53:43 +03:00 |
|
Anatoly
|
c1186dd597
|
added field - "distillery_types" to ES, change country field properties in TagCategory model
|
2020-01-13 17:07:42 +03:00 |
|
alex
|
35d9f37fab
|
fix serializer
|
2020-01-13 15:47:50 +03:00 |
|
alex
|
605a3e12e1
|
phone_list field create and update
|
2020-01-13 15:44:51 +03:00 |
|
dormantman
|
fdb0892377
|
Update unsubscribe url
|
2020-01-13 15:32:40 +03:00 |
|
dormantman
|
3506f6b2f0
|
Change templates
|
2020-01-13 14:34:11 +03:00 |
|
dormantman
|
9999096320
|
Added actions mailing
|
2020-01-13 14:01:58 +03:00 |
|
dormantman
|
469a246f49
|
Added subscribes notification
|
2020-01-13 13:37:19 +03:00 |
|
Kuroshini
|
2deb4b3b7f
|
some code improvements
|
2020-01-13 12:47:07 +03:00 |
|
dormantman
|
114304b3c9
|
Reformat builder method
|
2020-01-13 12:45:52 +03:00 |
|
dormantman
|
bb7cd98b98
|
Added news locale check
|
2020-01-13 12:45:52 +03:00 |
|
dormantman
|
f048cf2e17
|
Mailing fixed
|
2020-01-13 12:45:52 +03:00 |
|
dormantman
|
6c47fb404b
|
Fix news mailing
|
2020-01-13 12:45:52 +03:00 |
|
Kuroshini
|
3d030c91fe
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-13 12:12:15 +03:00 |
|
Kuroshini
|
28c674702c
|
fix news state update
|
2020-01-13 12:12:01 +03:00 |
|
alex
|
d6345f27e2
|
establishment menu currency id
|
2020-01-13 11:56:04 +03:00 |
|
Anatoly
|
b2f3e1f96b
|
added field - "distillery_types" in establishment list, detail and similar list view
|
2020-01-13 11:50:54 +03:00 |
|