Commit Graph

61 Commits

Author SHA1 Message Date
Anatoly
754b6d5b4f fix collection guides 2020-01-17 10:02:49 +03:00
Anatoly
d3c723eb43 intermediate commit 2019-12-30 19:07:06 +03:00
Anatoly
1468e5cdde intermediate commit 2019-12-30 18:15:55 +03:00
Anatoly
2827374911 intermediate commit 2019-12-30 13:22:57 +03:00
Anatoly
151c017561 see changes 2019-12-27 17:49:56 +03:00
Anatoly
b41c185a65 see changes 2019-12-27 14:46:36 +03:00
Anatoly
1189b6ff58 see changes 2019-12-26 10:24:08 +03:00
Anatoly
d9df886b98 added guide type field, added tasks, refactored GuideElement model, added endpoint, 2019-12-25 22:14:35 +03:00
Anatoly
65746b1cd0 Merge branch 'develop' into feature/guides
# Conflicts:
#	apps/collection/models.py
2019-12-24 12:33:39 +03:00
Anatoly
d9e45702ec merge 2019-12-24 12:24:13 +03:00
Anatoly
db5c879459 refactored method to get similar list on entities (see todo: establishment/models.py) 2019-12-23 17:53:48 +03:00
Dmitriy Kuzmenko
2580b9f218 Merge branch 'develop' into feature/collection-slugs
# Conflicts:
#	requirements/base.txt
2019-12-23 16:57:24 +03:00
Ruslan Stepanov
8efd4e3c77 Fix slugify 2019-12-23 13:20:46 +00:00
Anatoly
f576825a71 Merge branch 'develop' into feature/guides
# Conflicts:
#	apps/collection/models.py
#	apps/establishment/models.py
#	apps/establishment/views/web.py
#	apps/product/views/common.py
#	requirements/base.txt
2019-12-23 13:11:05 +03:00
Anatoly
7452f0bef0 intermediate commit 2019-12-23 12:38:13 +03:00
Anatoly
cc7125b468 added image url to es 2019-12-23 09:19:16 +03:00
dormantman
2ca31cedfb Added none condition to response 2019-12-20 16:59:14 +03:00
dormantman
0420fafabf Added types to collection objects 2019-12-20 16:52:25 +03:00
Anatoly
5a6af6a2a7 refactored a little bit 2019-12-19 16:39:42 +03:00
Anatoly
68b8aa427c added counters 2019-12-19 16:27:58 +03:00
Anatoly
0851a9e6d6 added filter values in guide views 2019-12-18 15:19:04 +03:00
Anatoly
54eee9565c fix guide element label photo 2019-12-18 12:02:39 +03:00
dormantman
c5bfdb9cde Added some params 2019-12-17 21:49:46 +03:00
dormantman
5a18be4584 Added slugify to create collection 2019-12-17 21:49:46 +03:00
Anatoly
471239983e Merge branch 'develop' into feature/guides
# Conflicts:
#	apps/collection/views/back.py
#	apps/transfer/models.py
2019-12-17 14:47:26 +03:00
dormantman
04bada1cd1 Fixed object names 2019-12-16 22:32:38 +03:00
dormantman
1545ca9035 Added description field 2019-12-16 22:26:14 +03:00
dormantman
c2a520b518 Reformat code style 2019-12-16 13:59:04 +03:00
dormantman
a9f5a5b98f Deleted description field 2019-12-16 13:34:54 +03:00
dormantman
8f6dd7e5c1 Added related_object_ids 2019-12-13 16:17:35 +03:00
Anatoly
86257153ac refactored guide ad label photos 2019-12-13 12:21:31 +03:00
dormantman
450ca4cf52 Added new field rank to collection 2019-12-13 03:50:12 +03:00
Anatoly
ab82d9a2d6 refactoring guide and collection endpoints 2019-12-10 16:24:37 +03:00
Anatoly
8af8cf92e9 added objects related statistic in Collection backoffice serializer 2019-12-06 17:00:54 +03:00
Anatoly
627f7562ec finalizing transfer guides 2019-12-04 14:21:54 +03:00
Anatoly
076d14fd5b added filter model 2019-12-02 13:51:48 +03:00
Anatoly
eaeebae72a in progress 2019-11-28 15:31:47 +03:00
Anatoly
f4b411e73d added tags, image urls to product serializers 2019-11-11 21:29:34 +03:00
Виктор Гладких
7b4837f4f3 Add 2019-10-31 17:04:25 +03:00
Anatoly
84fb0aec70 change field parameter in model Guide (gm-241) 2019-10-24 16:42:08 +03:00
Anatoly
97823ea601 change title field in model Collection to translated JSON field (gm-165) 2019-10-23 11:25:04 +03:00
Anatoly
4c9ea2e0e7 change field properties for Collection model 2019-10-22 15:45:58 +03:00
littlewolf
5793eaad32 Add queryset mixin
Switch view in urls/common
Add homepage view
Switch test
2019-09-26 20:17:50 +03:00
Kuroshini
6420a676df create slugs manually 2019-09-24 10:38:04 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
littlewolf
eca921592d Fix guide parent 2019-09-23 15:28:59 +03:00
Anatoly
2089ca067a chane FK to URLField in Collection model, added properties to field collections in Establishment model 2019-09-20 14:22:39 +03:00
Anatoly
413c93bead fixed problem with image, refactored favorites, collection 2019-09-20 13:35:59 +03:00
Anatoly
27a1998dbc GM-73: Логика похожих ресторанов 2019-09-17 15:36:33 +03:00
Anatoly
2172972216 refactored gallery app 2019-08-27 18:58:40 +03:00