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 |
|
Виктор Гладких
|
c32d3e4827
|
permission
|
2019-12-10 18:54:49 +03:00 |
|
Anatoly
|
3bbd76a4f8
|
added endpoints
|
2019-12-10 18:50:12 +03:00 |
|
Виктор Гладких
|
e3cf808e3d
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-10 18:37:36 +03:00 |
|
Виктор Гладких
|
0a8db7e3ad
|
permission
|
2019-12-10 18:36:18 +03:00 |
|
Anatoly
|
7d40471084
|
intermediate commit
|
2019-12-10 17:44:29 +03:00 |
|
littlewolf
|
68aafe75c0
|
Fix
|
2019-12-10 17:41:13 +03:00 |
|
littlewolf
|
47cb7f8e63
|
Tmp commit
|
2019-12-10 17:09:43 +03:00 |
|
Anatoly
|
ab82d9a2d6
|
refactoring guide and collection endpoints
|
2019-12-10 16:24:37 +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 |
|
Виктор Гладких
|
d441e69b81
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-10 12:51:30 +03:00 |
|
Виктор Гладких
|
3aa1ca98e0
|
Add test post
|
2019-12-10 12:50:38 +03:00 |
|
Виктор Гладких
|
0132a03852
|
Develop rules
|
2019-12-10 12:49:59 +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 |
|
Виктор Гладких
|
6b8fdf7eed
|
Add migrate for product models
|
2019-12-10 10:45:35 +03:00 |
|
alex
|
0647dd45f8
|
fix get_translated_value by type obj
|
2019-12-10 10:25:10 +03:00 |
|
littlewolf
|
323c2628e0
|
Add endpoint to get all cities with search string
|
2019-12-10 10:17:58 +03:00 |
|
alex
|
32e6e20c6b
|
fix get method
|
2019-12-10 10:15:04 +03:00 |
|
alex
|
96f3175827
|
fix get_name_translated
|
2019-12-10 09:45:35 +03:00 |
|
alex
|
ed18d1c44d
|
forgotten migrations
|
2019-12-10 09:24:32 +03:00 |
|
littlewolf
|
814807c564
|
Fix update_city_info
|
2019-12-09 21:15:55 +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 |
|
Anatoly
|
d330aa5205
|
refactoring
|
2019-12-09 13:34:17 +03:00 |
|
littlewolf
|
943dce90c7
|
Add migration
|
2019-12-09 12:17:41 +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 |
|
littlewolf
|
1e0201b950
|
Add merge
|
2019-12-09 11:33:14 +03:00 |
|