Commit Graph

20 Commits

Author SHA1 Message Date
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