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 |
|
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 |
|
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 |
|
d.kuzmenko
|
a52ffd443a
|
Merge branch 'feature/add-city-search' into 'develop'
Add filter
See merge request gm/gm-backend!164
|
2019-12-09 09:04:18 +00: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 |
|
Виктор Гладких
|
af7aef6d23
|
Add winery reviewer
|
2019-12-09 09:38:18 +03:00 |
|
Kuroshini
|
8451ccf17e
|
add ordering & optimize serializer
|
2019-12-06 19:17:38 +03:00 |
|
Kuroshini
|
b5a113c875
|
user last visit middleware
|
2019-12-06 18:53:40 +03:00 |
|
Dmitriy Kuzmenko
|
eb1cb011dc
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-06 18:17:21 +03:00 |
|
Dmitriy Kuzmenko
|
831cb4bc81
|
add home_page
|
2019-12-06 18:17:16 +03:00 |
|
Anatoly
|
f1fa8a58de
|
small refactoring
|
2019-12-06 17:37:33 +03:00 |
|
Anatoly
|
8af8cf92e9
|
added objects related statistic in Collection backoffice serializer
|
2019-12-06 17:00:54 +03:00 |
|
Виктор Гладких
|
8e63b969bf
|
Merge branch 'develop' into feature/permission_winery
|
2019-12-06 16:58:44 +03:00 |
|
Виктор Гладких
|
e824b5ee65
|
winery permission
|
2019-12-06 16:51:57 +03:00 |
|
Kuroshini
|
bdb82d0fb0
|
add migration command
|
2019-12-06 16:40:39 +03:00 |
|
Kuroshini
|
351d492012
|
command to remove relative news description images
|
2019-12-06 15:45:46 +03:00 |
|
Kuroshini
|
6a9356aaa6
|
fix merge conflicts
|
2019-12-06 15:10:48 +03:00 |
|
dormantman
|
0c5140d359
|
Added current product exclude
|
2019-12-06 15:03:18 +03:00 |
|
dormantman
|
1372538acf
|
Merge branch 'fix/dublicate-products' of /home/dormantman/PycharmProjects/gm-backend with conflicts.
|
2019-12-06 14:36:20 +03:00 |
|
d.kuzmenko
|
e761642b37
|
Merge branch 'feature/fix-partner-get' into 'develop'
Fix queryset
See merge request gm/gm-backend!159
|
2019-12-06 11:34:22 +00:00 |
|
d.kuzmenko
|
29d05929ff
|
Merge branch 'fix/backoffice-slug-url' into 'develop'
Fix/backoffice slug url
See merge request gm/gm-backend!169
|
2019-12-06 11:15:16 +00:00 |
|
alex
|
99e2b060f8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-06 14:12:59 +03:00 |
|
alex
|
e08296c52d
|
address to product detail web api
|
2019-12-06 14:12:26 +03:00 |
|
Kuroshini
|
91b528feb9
|
tags for establishments
|
2019-12-06 14:03:14 +03:00 |
|