Commit Graph

1979 Commits

Author SHA1 Message Date
Kuroshini
1771b02afd fix tags indexing 2019-12-20 21:57:46 +03:00
Kuroshini
0f0a3f9577 hardcoded tags 2019-12-20 21:10:28 +03:00
Kuroshini
ee8d133248 Example for tags creation 2019-12-20 20:11:58 +03:00
Kuroshini
dd07769b9b remove label fields from tags 2019-12-20 19:25:14 +03:00
Kuroshini
660c8e791b tags translation 2019-12-20 19:08:53 +03:00
Kuroshini
d1699e001e tag models translations in interface dictionary 2019-12-20 18:01:52 +03:00
Anatoly
72e5d723db added default image for type/subtype 2019-12-20 17:27:04 +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
Kuroshini
8e20424b78 bo creation & modification news info 2019-12-20 14:32:09 +03:00
littlewolf
769a71b5eb Fix 2019-12-20 13:52:20 +03:00
littlewolf
80759c24e7 Fix number 2019-12-20 13:19:56 +03:00
littlewolf
aa7ebf4d4c Merge remote-tracking branch 'origin/develop' into develop 2019-12-20 13:04:30 +03:00
littlewolf
2b8e158954 Merge branch 'feature/add-accounts-csv' into develop 2019-12-20 13:04:04 +03:00
littlewolf
7a5897e0bb Add slash
Add docs
2019-12-20 13:02:28 +03:00
Anatoly
35b7846ca1 refactored methods for getting similar establishments 2019-12-20 12:57:48 +03:00
Anatoly
821526d631 remove incorrect check for establishment, set schedule attr property as blank=True, refactored timetable model 2019-12-20 12:36:11 +03:00
Anatoly
36834835cd added filters to location views 2019-12-20 11:05:02 +03:00
Dmitriy Kuzmenko
71fb3249b0 add chenge to panel admin 2019-12-20 10:02:59 +03:00
Dmitriy Kuzmenko
93c9daf6c4 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-12-20 10:01:33 +03:00
Dmitriy Kuzmenko
f69d7d6e71 add chenge to panel admin 2019-12-20 10:01:22 +03:00
Kuroshini
2b117ba0f5 fix typo 2019-12-20 01:23:21 +03:00
Dmitriy Kuzmenko
847412bb2f Merge branch 'develop' into panels
# Conflicts:
#	apps/main/admin.py
2019-12-19 19:09:49 +03:00
Dmitriy Kuzmenko
a1f06fd0b9 panels executor 2019-12-19 19:07:23 +03:00
Kuroshini
bf4538b68a show only published products 2019-12-19 17:48:34 +03:00
Kuroshini
de648454c7 news to carousel 2019-12-19 17:30:02 +03:00
Kuroshini
f884d8303f carousel news item creation fix 2019-12-19 17:20:51 +03:00
Kuroshini
794ac84838 must of the week logic 2019-12-19 17:04:56 +03:00
Kuroshini
bfd8044b47 remove must_of_the_week field 2019-12-19 16:48:50 +03:00
Kuroshini
6924452569 fix news image binding 2019-12-19 15:12:49 +03:00
Kuroshini
f070ed8175 BO title is nullable now 2019-12-19 14:54:21 +03:00
alex
4ce01e5740 rm code field from city serializer 2019-12-19 13:08:26 +03:00
Kuroshini
67597c4fd4 Completely remove news start field 2019-12-18 19:21:35 +03:00
Kuroshini
6de33d82b0 news publication date & time are separate now 2019-12-18 18:58:55 +03:00
dormantman
62bee3156c Added description to update booking method
(cherry picked from commit a947eb1)
2019-12-18 18:40:05 +03:00
alex
4b563989a1 country_code in determine-location 2019-12-18 17:46:42 +03:00
dormantman
b6f0616e8e Added booking swagger description
(cherry picked from commit 794dd73)
2019-12-18 16:25:17 +03:00
alex
80dce51db2 country filter in region and country_code in cities 2019-12-18 15:55:05 +03:00
Kuroshini
3876a6b885 Revert "news creation extra kwargs possible fix"
This reverts commit b9a652a
2019-12-18 15:03:31 +03:00
Kuroshini
b9a652aeb6 news creation extra kwargs possible fix 2019-12-18 15:02:19 +03:00
Kuroshini
44c2616efe must of the week is compulsory argument for news creation now 2019-12-18 14:59:20 +03:00
Kuroshini
a8003dc1cc fix issue with news creation 2019-12-18 14:56:47 +03:00
Kuroshini
2a0d153be5 remove filtering news by locale 2019-12-18 14:52:49 +03:00
alex
ffa8409032 fix establishment description 2019-12-18 12:43:18 +03:00
Anatoly
2401763e6c Merge branch 'develop' into feature/guides 2019-12-18 12:03:45 +03:00
Anatoly
54eee9565c fix guide element label photo 2019-12-18 12:02:39 +03:00
Kuroshini
53387886cd must of the week 2019-12-17 23:13:57 +03:00
Kuroshini
23299ad4a1 news active logic depended on activated descriptions #3 2019-12-17 20:06:31 +03:00
Kuroshini
b9f65a3b18 news active logic depended on activated descriptions #2 2019-12-17 20:03:11 +03:00
Kuroshini
b469770ff0 news active logic depended on activated descriptions 2019-12-17 20:01:36 +03:00