Commit Graph

1358 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
b3345d612a renge_menu and carte 2019-11-04 02:25:04 +03:00
Dmitriy Kuzmenko
3462c74a65 modify add_menus 2019-11-04 00:50:37 +03:00
Dmitriy Kuzmenko
db6c93a72f add trensfer menus 2019-11-04 00:41:34 +03:00
Dmitriy Kuzmenko
9d3e278763 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-03 20:33:58 +03:00
Dmitriy Kuzmenko
8e61071759 add news tag command 2019-11-03 20:33:45 +03:00
a.feteleu
d0165df987 fix translation 2019-11-03 20:31:50 +03:00
alex
8eee337d34 fix last published establishment description 2019-11-03 19:12:47 +03:00
Dmitriy Kuzmenko
a30f863155 fix currency 2019-11-03 17:39:10 +03:00
Dmitriy Kuzmenko
f47e2996f4 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-03 17:13:39 +03:00
Dmitriy Kuzmenko
924b4e68e9 fix currency 2019-11-03 17:13:27 +03:00
Anatoly
4f89d7603e change translation mechanics 2019-11-03 17:00:47 +03:00
Dmitriy Kuzmenko
c50cd7c693 add migrations 2019-11-03 16:51:17 +03:00
Dmitriy Kuzmenko
02e45593ce Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-03 16:45:39 +03:00
Dmitriy Kuzmenko
689dca4ea1 add migrations 2019-11-03 16:45:22 +03:00
d.kuzmenko
902382a82a Merge branch 'feature/chosen_tags-logic' into 'develop'
Feature/chosen tags logic

See merge request gm/gm-backend!93
2019-11-03 13:20:51 +00:00
Dmitriy Kuzmenko
2e273e596d add migrations 2019-11-03 15:38:00 +03:00
Dmitriy Kuzmenko
c47f659657 add fix currency 2019-11-03 15:34:53 +03:00
Dmitriy Kuzmenko
b88c0d5213 modify script add_currency 2019-11-03 15:24:03 +03:00
Dmitriy Kuzmenko
1856589427 disabled inline in est, and change currency creator 2019-11-03 14:55:08 +03:00
Dmitriy Kuzmenko
398a982c82 add fix currency 2019-11-03 14:09:07 +03:00
Dmitriy Kuzmenko
791ff3f1c3 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-03 14:04:03 +03:00
Dmitriy Kuzmenko
1ac3cf95ca add currency 2019-11-03 14:03:47 +03:00
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
d.kuzmenko
0100476880 Merge branch 'feature/est_transporation' into 'develop'
Feature/est transporation

See merge request gm/gm-backend!94
2019-11-02 15:06:22 +00: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
Kuroshini
0f8425f363 Tags by category 2019-11-02 16:19:48 +03:00
Kuroshini
e69f272a63 Fix time format for frontend 2019-11-02 15:42:33 +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