Commit Graph

1138 Commits

Author SHA1 Message Date
Anatoly
10fb4ee0dd small fix 2019-11-03 01:40:45 +03:00
Anatoly
201dd40193 fixed related news, but in future need refactoring 2019-11-03 01:32:46 +03:00
Dmitriy Kuzmenko
248ab103a1 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-03 00:36:31 +03:00
Dmitriy Kuzmenko
c69ef65d79 add filter for description 2019-11-03 00:36:19 +03:00
Anatoly
c14ab722a1 change field parameter in model Guide (gm-241) 2019-11-03 00:25:03 +03:00
Dmitriy Kuzmenko
22b4b94f1b add filter for description 2019-11-03 00:11:08 +03:00
alex
9da10acd8e fix none value establishment description 2019-11-02 22:52:20 +03:00
alex
cc2c475b4e add_establishment_description with elastic error 2019-11-02 22:45:57 +03:00
Dmitriy Kuzmenko
f3899f5cb8 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-02 19:19:10 +03:00
Dmitriy Kuzmenko
914450e8c2 add translation fix for tag 2019-11-02 19:18:58 +03:00
GladkihViktor
9acf2f5c5f Code style 2019-11-02 17:58:00 +03:00
GladkihViktor
4d310515ab Merge branch 'develop' into feature/est_transporation 2019-11-02 17:55:08 +03:00
GladkihViktor
56b3d0dcc2 Update transportation 2019-11-02 17:54:24 +03:00
Dmitriy Kuzmenko
7de6043861 filter for tag 2019-11-02 17:19:59 +03:00
Dmitriy Kuzmenko
f3f06fcf09 filter for tag 2019-11-02 17:06:13 +03:00
GladkihViktor
ea830379fc Fix image url 2019-11-02 14:31:12 +03:00
evgeniy-st
4f67c295d1 Carousel link 2019-11-02 12:11:03 +03:00
evgeniy-st
dcea8b2a69 small fix 2019-11-02 12:05:18 +03:00
evgeniy-st
11d06b7b97 update Carousel model_name 2019-11-02 12:00:09 +03:00
Dmitriy Kuzmenko
1747f6e95c fix filter old_estab 2019-11-02 10:24:24 +03:00
Dmitriy Kuzmenko
20b9b9affd fix filter old_estab 2019-11-02 10:11:47 +03:00
Dmitriy Kuzmenko
4059446a3c add filter by exist Establishments 2019-11-02 10:04:32 +03:00
Dmitriy Kuzmenko
4108de5931 add filter for transfer establishment by fr 2019-11-02 09:17:18 +03:00
Anatoly
4e76fc966e added fix link for establishment preview_image 2019-11-01 18:43:48 +03:00
Dmitriy Kuzmenko
5928ee1884 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-01 18:21:03 +03:00
Dmitriy Kuzmenko
0d7187e330 change get image in carusel 2019-11-01 18:20:48 +03:00
Anatoly
fdd5c0bace added fix link for establishment preview_image, run - ./manage.py transfer --fix_establishment_preview_image 2019-11-01 18:10:53 +03:00
Dmitriy Kuzmenko
660eb347c5 add filter by country for carusel 2019-11-01 18:10:12 +03:00
alex
aab76d219f Merge remote-tracking branch 'origin/develop' into develop 2019-11-01 17:38:09 +03:00
alex
7acc8592a8 country for carousel 2019-11-01 17:37:53 +03:00
Dmitriy Kuzmenko
effe468777 add active to carusel 2019-11-01 16:56:37 +03:00
Виктор Гладких
8787a6b944 Fix 2019-11-01 16:27:09 +03:00
Виктор Гладких
afdc0154c6 Fix 2019-11-01 16:24:17 +03:00
Виктор Гладких
c51cfc1aa4 Fix publish collect 2019-11-01 16:18:33 +03:00
Semyon Yekhmenin
d17790dc34 Added filtering chosen tags by country 2019-11-01 12:54:24 +00:00
e.stoyushko
74aaab0e93 Merge branch 'bugfix/booking-subsscriver-fix' into 'develop'
Bugfix/booking subsscriver fix

See merge request gm/gm-backend!92
2019-11-01 12:46:44 +00:00
Kuroshini
e3670c051e Fix note mandatory && subscriber creation 2019-11-01 15:32:33 +03:00
Kuroshini
2cd69e02cb Fix note mandatory && subscriber creation 2019-11-01 15:31:30 +03:00
d.kuzmenko
975063b3f8 Merge branch 'feature/collect' into 'develop'
Fix

See merge request gm/gm-backend!91
2019-11-01 12:27:19 +00:00
Виктор Гладких
5e65bff2ba Fix 2019-11-01 15:19:42 +03:00
michail
f5a9763edf Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-01 17:15:16 +05:00
evgeniy-st
42cd311dc4 Carousel is parsed 2019-11-01 15:12:35 +03:00
michail
09e0a36313 added image url to partner model 2019-11-01 17:08:53 +05:00
evgeniy-st
445d76df75 boost name and name_translated in es search 2019-11-01 14:56:07 +03:00
Виктор Гладких
1df89b6c48 Merge branch 'develop' into feature/collect 2019-11-01 14:31:30 +03:00
Виктор Гладких
96aad4ff42 Fix country code 2019-11-01 14:28:01 +03:00
alex
84cefefa0b fix add_establishment_description 2019-11-01 14:14:16 +03:00
evgeniy-st
0fc951696c Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-01 12:58:15 +03:00
evgeniy-st
0e04b9d044 update toque calculating 2019-11-01 12:57:57 +03:00
littlewolf
41e48cb0e9 Merge branch 'feature/fix-country-transfer' into develop 2019-11-01 12:13:11 +03:00