Commit Graph

2871 Commits

Author SHA1 Message Date
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
dormantman
d3d4578bc7 Auto creating subscriber 2020-01-14 17:13:45 +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
dormantman
a447dfa471 Added method subscribe with code 2020-01-14 15:59:50 +03: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
dormantman
da1fa9d83a Added agenda creating 2020-01-13 18:59:01 +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
Kuroshini
f93337def3 Merge branch 'feature/news-subscription' into develop 2020-01-13 15:38:16 +03:00
dormantman
fdb0892377 Update unsubscribe url 2020-01-13 15:32:40 +03:00
Kuroshini
ada48b34aa Revert "try to boost translations fetch"
This reverts commit 34a246a
2020-01-13 15:01:17 +03:00
Kuroshini
34a246abab try to boost translations fetch 2020-01-13 14:58:55 +03:00
dormantman
3506f6b2f0 Change templates 2020-01-13 14:34:11 +03:00
Kuroshini
85f49b5cf6 Merge branch 'feature/news-subscription' into develop 2020-01-13 14:05:41 +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
9b2ad2a6dd try new email settings for dev 2020-01-13 13:37:11 +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
alex
d1572cbb56 rm publish filter from BO establishment api 2020-01-13 11:25:22 +03:00
Kuroshini
2c888d1c3a default ordering for BO establishments search 2020-01-13 11:16:02 +03:00
dormantman
62a66a80fb Added agenda validation in all methods 2020-01-11 07:56:21 +03:00
dormantman
bcf73897c8 Added agenda validation 2020-01-11 07:49:50 +03:00
dormantman
6e91a2ef92 Added non-required field agenda for methods 2020-01-11 07:27:37 +03:00
Kuroshini
dabc63647d fix 2020-01-10 19:56:53 +03:00
Kuroshini
8450e48d39 remove pagination 2020-01-10 19:42:44 +03:00
Kuroshini
591b67477f subscribe info fix 2020-01-10 19:36:09 +03:00
Kuroshini
41660933db ordering for backoffice establishments 2020-01-10 18:43:26 +03:00
Kuroshini
e1d417a9e6 add created establishment field to ES 2020-01-10 18:36:57 +03:00