Commit Graph

61 Commits

Author SHA1 Message Date
Anatoly
6d9852fc7b added guide type filter to guide list view 2020-02-05 14:16:36 +03:00
Anatoly
04c6948539 added endpoint /api/back/collections/guides/all/,
revert pagination in /api/back/collections/guides/
2020-02-04 11:36:46 +03:00
Anatoly
87686abbb7 disable counter for guide elements 2020-02-04 10:40:22 +03:00
Anatoly
400b5ac402 change display_country_code type of returning value, refactored create guide method, added filtering award type list, change name of username_random -> string_random 2020-02-03 17:16:40 +03:00
dormantman
982a52ab96 Added guides binding objects 2020-01-31 04:29:50 +03:00
Anatoly
61d2f6ec46 added filter - establishment_id, refactored guide counters 2020-01-28 17:52: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
f42f571053 see changes 2019-12-27 15:59:15 +03:00
Anatoly
b41c185a65 see changes 2019-12-27 14:46:36 +03:00
Dmitriy Kuzmenko
02d0112d8b add export for guides 2019-12-26 18:11:48 +03:00
Anatoly
1189b6ff58 see changes 2019-12-26 10:24:08 +03:00
Anatoly
986936fdf5 Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
#	apps/collection/views/back.py
2019-12-25 22:15:22 +03:00
Anatoly
d9df886b98 added guide type field, added tasks, refactored GuideElement model, added endpoint, 2019-12-25 22:14:35 +03:00
Dmitriy Kuzmenko
d7c7880860 add counter for public_mark and change Guid serializer 2019-12-25 15:19:43 +03:00
Anatoly
65746b1cd0 Merge branch 'develop' into feature/guides
# Conflicts:
#	apps/collection/models.py
2019-12-24 12:33:39 +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
Anatoly
7452f0bef0 intermediate commit 2019-12-23 12:38:13 +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
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
dormantman
04bada1cd1 Fixed object names 2019-12-16 22:32:38 +03:00
dormantman
fb05243281 Change related_object field 2019-12-16 16:55:11 +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
4eff488369 Added description field 2019-12-13 21:39:09 +03:00
dormantman
450ca4cf52 Added new field rank to collection 2019-12-13 03:50:12 +03:00
dormantman
e0a66f300b Hide unnecessary fields 2019-12-11 18:07:04 +03:00
Anatoly
3bbd76a4f8 added endpoints 2019-12-10 18:50:12 +03:00
Anatoly
7d40471084 intermediate commit 2019-12-10 17:44:29 +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
1d9ee76a5c fix es for establishments 2019-12-05 09:43:55 +03:00
Dmitriy Kuzmenko
2e17d7265d add back api for collection 2019-11-20 16:29:46 +03:00
Dmitriy Kuzmenko
2cd7755d7e add CRUD collections for back 2019-11-15 16:04:54 +03:00
Anatoly
eefbec20b1 fix swagger 2019-11-11 22:25:05 +03:00
Dmitriy Kuzmenko
7617981259 change command for migration of users 2019-11-11 15:29:31 +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
8e3bb54508 added endpoint for retrieving collection detail information 2019-10-02 15:09:19 +03:00
Kuroshini
1534c9b09c Remove unique
(cherry picked from commit f793c20)
2019-09-24 14:51:51 +03:00
Kuroshini
65914659e5 Slugs serializers 2019-09-24 12:31:35 +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
af0c134957 Fixed docs 2019-09-18 12:16:32 +03:00
Anatoly
27a1998dbc GM-73: Логика похожих ресторанов 2019-09-17 15:36:33 +03:00
Anatoly
79edd6c51d fixed collection list and news list endpoints 2019-08-29 11:42:52 +03:00