Commit Graph

2246 Commits

Author SHA1 Message Date
littlewolf
819e4366f7 Fix locatioin
Add decorator to log
2019-12-20 11:52:40 +03:00
alex
1c00cc7eae fix news transfer 2019-12-17 09:24:17 +03:00
littlewolf
181e9599e4 Merge branch 'develop' into feature/fix-country-region-city-transfer 2019-12-16 20:36:31 +03:00
littlewolf
385b405937 Tmp remove signal to location 2019-12-16 20:35:53 +03:00
Kuroshini
e68142bf2e BO news list by country 2019-12-16 18:43:15 +03:00
Anatoly
f861aa419c refactored transfer location serializers 2019-12-16 17:47:01 +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
littlewolf
4c27ad5d5a Fix location address transfer 2019-12-16 15:37:29 +03:00
Kuroshini
586f6e373b Anatoly, dont erase working code during refactoring pls 2019-12-16 15:30:05 +03:00
littlewolf
f542403b96 Fix country 2019-12-16 14:48:55 +03:00
littlewolf
1841da0097 Fix ruby cities
Fix transfer order
2019-12-16 14:48:55 +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
Anatoly
956aae281f refactored fix duplicates 2019-12-16 13:46:52 +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
littlewolf
ade2d03402 Fix ruby_data 2019-12-13 17:16:10 +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
Anatoly
833fada6d1 add fix migration issue 2019-12-13 15:11:40 +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
littlewolf
eb514c0ce2 Add clean db setup 2019-12-13 12:16:02 +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
littlewolf
6ef0e7adfe Merge branch 'develop' into feature/fix-country-region-city-transfer 2019-12-13 09:18:44 +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
Anatoly
8ca8c73b4b fix get_ruby_data 2019-12-12 17:15:08 +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