Anatoly
|
c1186dd597
|
added field - "distillery_types" to ES, change country field properties in TagCategory model
|
2020-01-13 17:07:42 +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 |
|
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 |
|
Anatoly
|
0a3fe15e9c
|
small refactoring (/.../establishments/slug/{slug}/similar/artisans/distilleries to /.../establishments/slug/{slug}/similar/producers/distilleries)
|
2020-01-10 17:25:27 +03:00 |
|
Anatoly
|
db8917e7af
|
added two endpoints: /.../establishments/slug/{slug}/similar/producers/food/, /.../establishments/slug/{slug}/similar/artisans/distilleries/
|
2020-01-10 17:25:27 +03:00 |
|
Олег Хаятов
|
de35a1c0d5
|
Merge branch 'feature/news-subscription' into 'develop'
Added unsubscribe action
See merge request gm/gm-backend!198
|
2020-01-10 13:16:21 +00:00 |
|
dormantman
|
2800f2f158
|
Fix unsubscribe bug
|
2020-01-10 16:11:10 +03:00 |
|
alex
|
989e9f9465
|
last country
|
2020-01-10 15:57:36 +03:00 |
|
Kuroshini
|
e8538d4fc2
|
unique slugs even in the same news object
|
2020-01-10 15:22:17 +03:00 |
|
Anatoly
|
23f8c0bbcd
|
added field address_id to request data in /api/back/establishments/
in Establishment make as mandatory field address
|
2020-01-10 14:40:54 +03:00 |
|
alex
|
a16e76e393
|
last_ip middleware
|
2020-01-10 14:34:52 +03:00 |
|
alex
|
6ad4e0d46f
|
last_ip
|
2020-01-10 14:27:00 +03:00 |
|
Kuroshini
|
a925d2f623
|
create est with address id #2
|
2020-01-10 14:04:11 +03:00 |
|
Kuroshini
|
c22fb3fb5c
|
create est with address id
|
2020-01-10 14:01:59 +03:00 |
|
Anatoly
|
75e4077917
|
refactored structure of XML-document
|
2020-01-10 13:06:17 +03:00 |
|
dormantman
|
fcfebcd952
|
Added unsubscribe action
|
2020-01-09 19:46:12 +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 |
|
Dmitriy Kuzmenko
|
807f8b4169
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2020-01-09 17:47:26 +03:00 |
|
Dmitriy Kuzmenko
|
5041798020
|
add pagination for employee
|
2020-01-09 17:47:09 +03:00 |
|
alex
|
989d0d4abd
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-09 16:29:45 +03:00 |
|
alex
|
30e25c2da0
|
fix EmployeeBackSerializers
|
2020-01-09 16:29:33 +03:00 |
|
Anatoly
|
a59016944c
|
Merge branch 'develop' into feature/guides
|
2020-01-09 15:00:58 +03:00 |
|
Anatoly
|
b457ffe975
|
small changes
|
2020-01-09 14:59:29 +03:00 |
|
Kuroshini
|
fa8b4d6d97
|
chosen tags for recipes
|
2020-01-09 13:48:38 +03:00 |
|
Kuroshini
|
33a616ab96
|
fix transfer translation for news
|
2020-01-09 13:08:59 +03:00 |
|
Kuroshini
|
2bceb0b309
|
Merge branch 'feature/news-subscription' into develop
|
2020-01-09 11:49:53 +03:00 |
|
Kuroshini
|
0f8cf72cd8
|
Merge branch 'feature/news-subscription' into develop
|
2020-01-09 11:49:24 +03:00 |
|