Kuroshini
|
10ca6d8932
|
remove hardcode from migration
|
2019-12-16 22:13:25 +03:00 |
|
Олег Хаятов
|
1ce8686368
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!179
|
2019-12-16 19:10:33 +00:00 |
|
dormantman
|
b09d3af35f
|
Hardcode collection description migrate
|
2019-12-16 22:00:42 +03:00 |
|
Kuroshini
|
e68142bf2e
|
BO news list by country
|
2019-12-16 18:43:15 +03:00 |
|
Kuroshini
|
b25f387c9b
|
news search
|
2019-12-16 17:29:01 +03:00 |
|
Kuroshini
|
f4fff47d68
|
return news object after binding #2
|
2019-12-16 17:04:52 +03:00 |
|
Kuroshini
|
cf001b3aab
|
return news object after binding
|
2019-12-16 17:02:45 +03:00 |
|
alex
|
6c483dd228
|
recipe transfer
|
2019-12-16 17:02:20 +03:00 |
|
dormantman
|
fb05243281
|
Change related_object field
|
2019-12-16 16:55:11 +03:00 |
|
Kuroshini
|
586f6e373b
|
Anatoly, dont erase working code during refactoring pls
|
2019-12-16 15:30:05 +03:00 |
|
dormantman
|
33ac0ad3e6
|
Delete useless import
|
2019-12-16 14:03:44 +03:00 |
|
Олег Хаятов
|
23522eb1f0
|
Merge branch 'feature/back-office-collections' into 'develop'
Feature/back office collections
See merge request gm/gm-backend!178
|
2019-12-16 11:02:27 +00: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
|
def1372317
|
Change ordering format
|
2019-12-16 01:02:21 +03:00 |
|
dormantman
|
b847de1183
|
Added collection migration
|
2019-12-16 01:01:56 +03:00 |
|
Kuroshini
|
a120ea1f1b
|
fix search for products
|
2019-12-13 22:05:16 +03:00 |
|
dormantman
|
4eff488369
|
Added description field
|
2019-12-13 21:39:09 +03:00 |
|
Kuroshini
|
c5056224e0
|
sort filters
|
2019-12-13 21:19:15 +03:00 |
|
dormantman
|
525658f39b
|
Reformat ordering
|
2019-12-13 18:32:06 +03:00 |
|
Kuroshini
|
f7e4effb9f
|
dynamic filters
|
2019-12-13 16:48:59 +03:00 |
|
dormantman
|
8f6dd7e5c1
|
Added related_object_ids
|
2019-12-13 16:17:35 +03:00 |
|
Dmitriy Kuzmenko
|
6e72c7c0e4
|
merge with debelop
|
2019-12-13 15:47:05 +03:00 |
|
Kuroshini
|
9fbb8f01de
|
dynamic filters
|
2019-12-13 14:57:24 +03:00 |
|
Dmitriy Kuzmenko
|
295518fd12
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-13 13:24:16 +03:00 |
|
Dmitriy Kuzmenko
|
ae15a5e66b
|
fix migration
|
2019-12-13 13:24:04 +03:00 |
|
Kuroshini
|
54db050f03
|
return tags_id__in
|
2019-12-13 13:23:49 +03:00 |
|
Anatoly
|
86257153ac
|
refactored guide ad label photos
|
2019-12-13 12:21:31 +03:00 |
|
Dmitriy Kuzmenko
|
8aa2cb71f3
|
fix migrations
|
2019-12-13 12:08:24 +03:00 |
|
Dmitriy Kuzmenko
|
4c872b936b
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# apps/account/urls/back.py
# apps/account/views/back.py
# apps/transfer/models.py
|
2019-12-13 11:17:12 +03:00 |
|
Dmitriy Kuzmenko
|
f6427e732a
|
Merge remote-tracking branch 'origin/develop' into owner_list
# Conflicts:
# apps/transfer/models.py
|
2019-12-13 11:08:18 +03:00 |
|
Dmitriy Kuzmenko
|
bd6f8a47a1
|
add api for establishment admin
|
2019-12-13 11:02:37 +03:00 |
|
dormantman
|
5c171c644c
|
Added mixins
|
2019-12-13 03:52:52 +03:00 |
|
dormantman
|
450ca4cf52
|
Added new field rank to collection
|
2019-12-13 03:50:12 +03:00 |
|
Kuroshini
|
0193ca90e3
|
dynamic filters
|
2019-12-12 22:07:07 +03:00 |
|
Kuroshini
|
38f2211982
|
sum fixes for mobile filters
|
2019-12-12 19:05:47 +03:00 |
|
Kuroshini
|
16def7df5d
|
search crunches for mobiles
|
2019-12-12 18:22:52 +03:00 |
|
Anatoly
|
e2ec179f69
|
refactored the mechanism for finding similar establishments
|
2019-12-12 18:10:20 +03:00 |
|
Kuroshini
|
b58d54c07e
|
smallfix
|
2019-12-12 17:06:37 +03:00 |
|
alex
|
731b45ff53
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-12-12 16:58:29 +03:00 |
|
alex
|
f565285abd
|
back menu filter by establishment
|
2019-12-12 16:58:13 +03:00 |
|
Kuroshini
|
fcf3999d3d
|
news duplication date
|
2019-12-12 16:51:55 +03:00 |
|
Kuroshini
|
bd3dd47742
|
slugs news
|
2019-12-12 16:27:40 +03:00 |
|
Kuroshini
|
22408bf21f
|
Merge branch 'feature/news-doubles' into develop
|
2019-12-12 16:10:02 +03:00 |
|
Kuroshini
|
755f007d25
|
clone news API method
|
2019-12-12 16:09:43 +03:00 |
|
Dmitriy Kuzmenko
|
826abd9142
|
Merge branch 'sql_panel' into develop
|
2019-12-12 15:39:12 +03:00 |
|
Dmitriy Kuzmenko
|
b03cd4fe09
|
add transfer command, models and crud api.
|
2019-12-12 15:37:42 +03:00 |
|
alex
|
3e83bdff59
|
pagination & ordering & country code
|
2019-12-12 15:34:36 +03:00 |
|
alex
|
e3d41ecd8d
|
Merge remote-tracking branch 'origin/develop' into es_product
|
2019-12-12 09:35:28 +03:00 |
|
Kuroshini
|
9d2b7ff77c
|
add migration
|
2019-12-11 19:18:04 +03:00 |
|
Kuroshini
|
60f6c8d811
|
fix migrations
|
2019-12-11 19:15:19 +03:00 |
|
Kuroshini
|
370f9cc7ce
|
remove wrong migration
|
2019-12-11 18:26:29 +03:00 |
|
Kuroshini
|
56501d76f2
|
order images
|
2019-12-11 18:20:53 +03:00 |
|
Dmitriy Kuzmenko
|
86b2e708f0
|
add datamigrate and change for models
|
2019-12-11 18:12:26 +03:00 |
|
Dmitriy Kuzmenko
|
d2f011417a
|
add datamigrate and change for models
|
2019-12-11 18:11:39 +03:00 |
|
dormantman
|
e0a66f300b
|
Hide unnecessary fields
|
2019-12-11 18:07:04 +03:00 |
|
dormantman
|
a6b77e74b5
|
Remove unnecessary slash
|
2019-12-11 17:59:42 +03:00 |
|
dormantman
|
6cbfc38c9c
|
Added back collections method for collection detail
|
2019-12-11 17:58:39 +03:00 |
|
Kuroshini
|
90f75c6da5
|
update news gallery
|
2019-12-11 17:54:53 +03:00 |
|
alex
|
bbb72dabbe
|
Merge remote-tracking branch 'origin/develop' into es_product
|
2019-12-11 17:10:56 +03:00 |
|
Kuroshini
|
f182ec4981
|
remove wrong unique constraint
|
2019-12-11 17:07:29 +03:00 |
|
Kuroshini
|
df00ceaa02
|
Merge branch 'feature/reformat-filter-requests' into develop
|
2019-12-11 16:47:15 +03:00 |
|
dormantman
|
0b1b960108
|
Remove excess output
|
2019-12-11 16:27:52 +03:00 |
|
dormantman
|
9f27b0c5d9
|
Added different types
|
2019-12-11 16:27:18 +03:00 |
|
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
|
b68e98e9aa
|
Merge branch 'feature/add-accounts-csv' into 'develop'
Feature/add accounts csv
See merge request gm/gm-backend!177
|
2019-12-11 13:19:50 +00: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 |
|
littlewolf
|
a254160f43
|
Add account csv endpoint
|
2019-12-11 12:10:26 +03:00 |
|
alex
|
ca2ac15cdb
|
fix product type
|
2019-12-11 10:23:59 +03:00 |
|
alex
|
41659958f7
|
product establishment_detail address
|
2019-12-11 09:10:49 +03:00 |
|
alex
|
b5e1344b38
|
Merge remote-tracking branch 'origin/develop' into es_product
|
2019-12-11 07:56:57 +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 |
|
Anatoly
|
3bbd76a4f8
|
added endpoints
|
2019-12-10 18:50:12 +03:00 |
|
Anatoly
|
7d40471084
|
intermediate commit
|
2019-12-10 17:44:29 +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 |
|
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
|
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 |
|
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 |
|
Виктор Гладких
|
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
|
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 |
|
Kuroshini
|
7635eafb09
|
booking urls for mobile
(cherry picked from commit 0df3425)
|
2019-12-06 13:11:58 +03:00 |
|
Anatoly
|
b659308729
|
exclude field from Establishment serializer
|
2019-12-06 13:06:59 +03:00 |
|
Виктор Гладких
|
8c8acd3e19
|
Models
|
2019-12-06 11:13:07 +03:00 |
|
alex
|
48ae6a437d
|
street_name_2 clear
|
2019-12-06 10:29:43 +03:00 |
|
Виктор Гладких
|
cbf998569a
|
Merge branch 'develop' into feature/permission_winery
|
2019-12-06 09:46:29 +03:00 |
|
Виктор Гладких
|
88b190d76d
|
winery choice
|
2019-12-06 09:45:38 +03:00 |
|