Commit Graph

40 Commits

Author SHA1 Message Date
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
Dmitriy Kuzmenko
63304aa2d1 add merge migrations 2019-12-23 17:16:33 +03:00
Dmitriy Kuzmenko
2580b9f218 Merge branch 'develop' into feature/collection-slugs
# Conflicts:
#	requirements/base.txt
2019-12-23 16:57:24 +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
54eee9565c fix guide element label photo 2019-12-18 12:02:39 +03:00
Kuroshini
1131b02891 add collection migration & fix serializer according to the task 2019-12-17 21:53:42 +03:00
Anatoly
387e164510 merged from develop, added merge migration and refactored a little bit 2019-12-17 15:20:55 +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
Kuroshini
10ca6d8932 remove hardcode from migration 2019-12-16 22:13:25 +03:00
dormantman
b09d3af35f Hardcode collection description migrate 2019-12-16 22:00:42 +03:00
dormantman
a9f5a5b98f Deleted description field 2019-12-16 13:34:54 +03:00
dormantman
b847de1183 Added collection migration 2019-12-16 01:01:56 +03:00
Anatoly
86257153ac refactored guide ad label photos 2019-12-13 12:21:31 +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
Виктор Гладких
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
Kuroshini
d224c77a01 Fix issues with test && recreate migrations 2019-09-24 12:06:11 +03:00
Kuroshini
73a858cc8c Slugs feature migrations 2019-09-24 10:38:04 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
evgeniy-st
8f60937e4b Fix migration collection 2019-09-23 16:44:28 +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
Anatoly
ce260a69aa Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"
This reverts commit 07333234
2019-08-27 18:18:58 +03:00
Anatoly
df2e60254e fixed migrations 2019-08-27 17:50:24 +03:00
Anatoly
0733323486 added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections 2019-08-27 17:15:09 +03:00
Anatoly
9687a0ec3b added verbose names to collection app models 2019-08-23 17:02:18 +03:00
Anatoly
919c625bbc added flag on_top to model Collection, refactored CollectionList view 2019-08-23 16:30:28 +03:00
Anatoly
e88fea10e7 added fields to model Collection, refactored Collection serializer, 2019-08-23 12:59:10 +03:00
Anatoly
57e7219276 Added field is_publish to model Collection, updated endpoint to get collection list 2019-08-21 16:53:45 +03:00
Anatoly
95040a74d0 added migrations for app collection 2019-08-21 11:05:57 +03:00
Anatoly
d24c0cf407 added app collection, added new models 2019-08-21 09:58:45 +03:00