Commit Graph

2289 Commits

Author SHA1 Message Date
Kuroshini
913da37b84 return collections dsc field 2019-12-16 22:26:38 +03:00
dormantman
1545ca9035 Added description field 2019-12-16 22:26:14 +03:00
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
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
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