Commit Graph

1828 Commits

Author SHA1 Message Date
dormantman
d8e3ad0bb5 Added works_at_weekday 2019-12-11 16:26:43 +03:00
dormantman
f0709fa409 Fixed tag filter type 2019-12-11 16:22:30 +03:00
d.kuzmenko
f55983a46f Merge branch 'feature/add-city-search' into 'develop'
Add endpoint to get all cities with search string

See merge request gm/gm-backend!174
2019-12-11 13:18:58 +00:00
Kuroshini
39c8f6d152 remove carousel hardcode 2019-12-11 15:47:08 +03:00
Kuroshini
165509bc64 update news_gallery model 2019-12-11 15:13:06 +03:00
Kuroshini
822b18e2f4 create new image after crop 2019-12-11 14:58:31 +03:00
Kuroshini
6b3ee76b80 Merge branch 'feature/reformat-filter-requests' into develop 2019-12-11 13:23:41 +03:00
dormantman
19c42ab1d7 Added page types 2019-12-11 13:03:31 +03:00
Anatoly
fb5a9d4302 refactored ads 2019-12-11 12:26:32 +03:00
Kuroshini
907a9365e1 fix multislug news update 2019-12-11 12:14:23 +03:00
Kuroshini
043fcb262b fix test #2 2019-12-10 23:30:07 +03:00
Kuroshini
ecef1a217a fix some test 2019-12-10 22:10:37 +03:00
Kuroshini
377d8196dc fix slugs serialization 2019-12-10 20:58:08 +03:00
Kuroshini
401abc568c news unique slug creation 2019-12-10 20:04:23 +03:00
Kuroshini
77af35f543 many slugs es news fix 2019-12-10 19:33:15 +03:00
Kuroshini
c90f8302ee fix news indexing 2019-12-10 19:29:11 +03:00
dormantman
096d5dab18 Added tags/filters method 2019-12-10 19:24:56 +03:00
Kuroshini
c1bb7c9b79 News multilang slug (ES) 2019-12-10 19:23:40 +03:00
Kuroshini
4010c9fede News multilang slugs (model && views) 2019-12-10 19:16:19 +03:00
Kuroshini
34173afb05 fix field analyzer 2019-12-10 15:41:33 +03:00
Kuroshini
3b85e927a1 BO title field 2019-12-10 15:39:53 +03:00
Kuroshini
bec4e9be96 ordering from center for mobiles 2019-12-10 15:34:51 +03:00
dormantman
4ec812d617 Created new category_test url 2019-12-10 14:27:16 +03:00
Anatoly
aea5c9e96b Merge branch 'develop' into feature/similar-wines 2019-12-10 13:11:40 +03:00
Anatoly
51da45b00b refactoring 2019-12-10 13:08:28 +03:00
Anatoly
439fb17778 Merge branch 'develop' into feature/similar-wines 2019-12-10 12:46:44 +03:00
Kuroshini
ce5e5f6cb7 fix issue w/ tag_category 2019-12-10 12:42:42 +03:00
littlewolf
323c2628e0 Add endpoint to get all cities with search string 2019-12-10 10:17:58 +03:00
alex
ed18d1c44d forgotten migrations 2019-12-10 09:24:32 +03:00
Kuroshini
a2395b807e User locale & city reading 2019-12-09 20:42:47 +03:00
Kuroshini
7910c98c8a add wine_origins 2019-12-09 18:20:32 +03:00
Dmitriy Kuzmenko
9d557e4ce8 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-12-09 17:47:51 +03:00
Dmitriy Kuzmenko
6af7a7da5b add footer migrations and api 2019-12-09 17:47:37 +03:00
Kuroshini
be793eed73 fix issue w/ tags binding 2019-12-09 17:40:05 +03:00
Kuroshini
d12ad93fe1 try to fix issue w/ news tag binding 2019-12-09 17:21:07 +03:00
d.kuzmenko
6a3a40be4f Merge branch 'feature/permission_winery' into 'develop'
Feature/permission winery

See merge request gm/gm-backend!173
2019-12-09 14:05:48 +00:00
Kuroshini
a6728e3148 wine_origins for favorites establishments 2019-12-09 16:59:40 +03:00
Kuroshini
0f11a47a79 rest category & rest cuisine for favs
(cherry picked from commit 79a70fb)
2019-12-09 16:48:50 +03:00
Виктор Гладких
c3c5cfcac5 Merge branch 'develop' into feature/permission_winery 2019-12-09 16:36:17 +03:00
Виктор Гладких
188f8877b4 Fix test 2019-12-09 16:35:38 +03:00
Kuroshini
912431690d rename attrs #2 2019-12-09 15:21:39 +03:00
Kuroshini
ea760fc674 rename attrs 2019-12-09 15:00:24 +03:00
Anatoly
dc7a6a911a refactoring 2019-12-09 14:29:54 +03:00
Dmitriy Kuzmenko
3e0fad2139 add merge of migrations 2019-12-09 12:14:55 +03:00
d.kuzmenko
6bf40cc793 Merge branch 'fix/check_tags' into 'develop'
Fix/check tags

See merge request gm/gm-backend!148
2019-12-09 09:08:02 +00:00
Dmitriy Kuzmenko
f6cb62c49c Merge branch 'develop' into fix/check_tags 2019-12-09 12:06:37 +03:00
Dmitriy Kuzmenko
dfe4ab92a6 Merge remote-tracking branch 'origin/develop' into feature/add-city-search
# Conflicts:
#	_dockerfiles/db/Dockerfile
#	project/settings/local.py
2019-12-09 11:41:02 +03:00
Виктор Гладких
38839f75f9 Fix account test 2019-12-09 09:59:17 +03:00
Виктор Гладких
bd567200c8 Merge branch 'develop' into feature/permission_winery 2019-12-09 09:40:33 +03:00
Виктор Гладких
5cac9659e5 Clean code 2019-12-09 09:38:58 +03:00