Commit Graph

47 Commits

Author SHA1 Message Date
Kuroshini
f52847a71a Remove all crunches from projects 2019-11-05 14:29:53 +03:00
d.kuzmenko
6f0122fe35 Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Remove doubles

See merge request gm/gm-backend!98
2019-11-04 11:37:17 +00:00
Kuroshini
cf1bb0a88c Remove doubles 2019-11-04 14:30:03 +03:00
d.kuzmenko
3abb74d19e Merge branch 'feature/chosen-tags-hardcode' into 'develop'
Temp crunch for chosen tags

See merge request gm/gm-backend!96
2019-11-04 08:58:41 +00:00
Dmitriy Kuzmenko
fb3e5e5c93 change add_tags 2019-11-04 10:53:16 +03:00
Kuroshini
b8fe50f806 Temp crunch for chosen tags 2019-11-03 22:45:44 +03:00
Dmitriy Kuzmenko
8e61071759 add news tag command 2019-11-03 20:33:45 +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
914450e8c2 add translation fix for tag 2019-11-02 19:18:58 +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
Semyon Yekhmenin
d17790dc34 Added filtering chosen tags by country 2019-11-01 12:54:24 +00:00
Kuroshini
26e04719c3 Index name for tags 2019-10-31 17:58:39 +03:00
Anatoly
fe586755e3 small fix 2019-10-31 17:54:56 +03:00
Anatoly
6fe8252025 need refactoring, put temporary solution
TagBaseSerializer
TagCategoryBaseSerializer
2019-10-31 11:04:53 +03:00
a.feteleu
a4c9c8f0cc fix tags command 2019-10-31 02:16:29 +03:00
Dmitriy Kuzmenko
e653e6c7da fix tag command 2019-10-31 00:53:01 +03:00
Dmitriy Kuzmenko
aa2759d7e0 fix estab tags 2019-10-30 19:51:33 +03:00
Dmitriy Kuzmenko
58be2491a5 create command for establishment tags 2019-10-30 18:47:13 +03:00
Semyon Yekhmenin
890d1004e1 Added view for chosen tags 2019-10-24 07:44:47 +00:00
Kuroshini
bc50f118b8 Merge branch 'feature/tag-name-indexing' into develop 2019-10-23 18:09:41 +03:00
Kuroshini
b2341194bc fix serializer 2019-10-23 18:08:43 +03:00
Sergey Melihov
ab5b5801fd Merge branch 'feature/tag-name-indexing' into 'develop'
tag category indexing name

See merge request gm/gm-backend!65
2019-10-23 15:00:39 +00:00
Kuroshini
125c438f19 Review fix #2 2019-10-23 17:08:40 +03:00
Kuroshini
f46d4bd9f1 Review fix 2019-10-23 13:39:45 +03:00
Kuroshini
4a0a305e2c tag category indexing name 2019-10-22 18:45:31 +03:00
evgeniy-st
55263e4059 remove merge migration 2019-10-21 16:51:01 +03:00
evgeniy-st
9c80811020 Merge branch 'develop' into feature/gm-148 2019-10-21 16:50:18 +03:00
evgeniy-st
19caf9faa6 Merge branch 'feature/gm-148' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/gm-148 2019-10-21 16:48:39 +03:00
evgeniy-st
94502cfc73 added priority field to tag model (f7facf826d) 2019-10-21 16:47:01 +03:00
evgeniy-st
f96a1d4aa2 Revert "Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field."
This reverts commit f7facf826d.
2019-10-21 16:42:08 +03:00
Kuroshini
cc5249674d merge migrations 2019-10-21 14:39:23 +03:00
evgeniy-st
2dbe65a169 Merge branch 'feature/gm-192' into feature/gm-148 2019-10-21 10:31:06 +03:00
evgeniy-st
1cd586662a fix tagcategory binding serializer 2019-10-21 10:12:30 +03:00
Semyon
f7facf826d Implemented chosen tags by adding priority field: chosen tags should have non-null priority field, other tags should have null priority field. 2019-10-18 18:37:24 +03:00
evgeniy-st
21e3f76f5a Backoffice Tag&TagCategory 2019-10-18 18:02:24 +03:00
evgeniy-st
9661de4810 Establishment types 2019-10-17 15:17:29 +03:00
Kuroshini
8dad3df4bf Added route for mobile tags 2019-10-16 14:11:07 +03:00
Kuroshini
e0bce99ca9 Fix issue with copies 2019-10-15 21:40:55 +03:00
evgeniy-st
9d4c483f51 clean models (tags) 2019-10-15 18:25:09 +03:00
evgeniy-st
42ae1cbb87 fix tagcategory queryset 2019-10-15 18:13:37 +03:00
evgeniy-st
c94ad3f017 comment some code 2019-10-15 17:48:01 +03:00
evgeniy-st
60cdec99e0 refactor tags 2019-10-15 17:17:03 +03:00
evgeniy-st
074a5ec5ea refactor news tags 2019-10-09 18:25:40 +03:00
Anatoly
ca5f588466 fix elastic document, fix prefetch and select related 2019-10-09 12:53:35 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +03:00