Commit Graph

2181 Commits

Author SHA1 Message Date
Kuroshini
af8febbe45 subscription work out #2 2019-12-30 23:41:58 +03:00
Kuroshini
fc215129ed subscriptions work out 2019-12-30 22:26:18 +03:00
dormantman
974e0ce8fe Added saving date 2019-12-30 22:23:16 +03:00
dormantman
25e118cf0b Optimize 2019-12-30 22:23:16 +03:00
dormantman
13022ed476 Fix subsribtions 2019-12-30 22:23:16 +03:00
dormantman
d9f1da1e49 Fix unsubscribe 2019-12-30 22:23:16 +03:00
dormantman
a76efac4a8 Added corrections migrate 2019-12-30 22:23:16 +03:00
dormantman
fe330e4270 Reformat structure 2019-12-30 22:23:16 +03:00
dormantman
449e0675fa Added migrations 2019-12-30 22:23:16 +03:00
dormantman
7baf022a77 Added correct creating subscribe 2019-12-30 22:23:16 +03:00
dormantman
eac841f41f Added model Subscribe 2019-12-30 22:23:16 +03:00
dormantman
fb91383be5 Added last subscribe/unsubscribe dates 2019-12-30 22:23:16 +03:00
Kuroshini
ad21b6eb24 transfer tags with translations 2019-12-30 17:31:09 +03:00
alex
ca6a57f012 Merge remote-tracking branch 'origin/develop' into develop 2019-12-30 16:38:51 +03:00
alex
6b52feffd8 fix similar_artisans_producers 2019-12-30 16:38:42 +03:00
Dmitriy Kuzmenko
b27e032f15 change update index for Establishment 2019-12-30 16:36:00 +03:00
Anatoly
cb6834b3c0 Merge branch 'develop' into feature/guides 2019-12-30 13:23:28 +03:00
Anatoly
2827374911 intermediate commit 2019-12-30 13:22:57 +03:00
d.kuzmenko
700d8b5286 Merge branch 'feature/fix-location-sort' into 'develop'
Add order

See merge request gm/gm-backend!189
2019-12-30 07:45:00 +00:00
a.feteleu
8f2ae21aa0 fix swagger 2019-12-30 10:43:20 +03:00
Dmitriy Kuzmenko
e2d71fca8f Merge branch 'develop' into feature/guides 2019-12-27 18:00:20 +03:00
Dmitriy Kuzmenko
ccd9f717df Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
#	apps/utils/export.py
2019-12-27 17:59:20 +03:00
Dmitriy Kuzmenko
d09776c8fa add xml 2019-12-27 17:57:16 +03:00
Anatoly
151c017561 see changes 2019-12-27 17:49:56 +03:00
alex
dbdeef8642 Merge remote-tracking branch 'origin/develop' into develop 2019-12-27 17:39:57 +03:00
alex
c9d36ebd1a fix product es 2019-12-27 17:39:47 +03:00
Kuroshini
768a01e119 return in_favorites flag 2019-12-27 17:39:05 +03:00
d.kuzmenko
c32c950260 Merge branch 'feature/profile' into 'develop'
Feature/profile

See merge request gm/gm-backend!190
2019-12-27 13:57:31 +00:00
Виктор Гладких
4e82d5275a Fix 2019-12-27 16:55:01 +03:00
Kuroshini
ea20d6d4c1 remove lookups from subtypes 2019-12-27 16:52:10 +03:00
Виктор Гладких
ab5bb5c190 Merge branch 'develop' into feature/profile 2019-12-27 16:35:57 +03:00
Виктор Гладких
660d60e656 Lite refactor 2019-12-27 16:30:31 +03:00
Виктор Гладких
caa17bf9f4 Serialize employee with positions, public_mark and establishment 2019-12-27 16:13:22 +03:00
Anatoly
f42f571053 see changes 2019-12-27 15:59:15 +03:00
Kuroshini
57c7f0dcdf fix ES 2019-12-27 15:56:37 +03:00
Kuroshini
57be30fa0e fix es establishments serializer 2019-12-27 14:49:35 +03:00
Anatoly
b41c185a65 see changes 2019-12-27 14:46:36 +03:00
alex
ae486d81fa city filter for establishment 2019-12-27 14:32:09 +03:00
alex
32ae1856b6 preview_image to establishment and product type and subtype 2019-12-27 12:42:45 +03:00
alex
b958e0b597 preview_image fix 2019-12-27 11:16:38 +03:00
alex
e3d7618c62 preview_image to establishment and product type and subtype 2019-12-27 09:47:48 +03:00
Kuroshini
8abb582e49 fix patch news BO 2019-12-26 19:23:28 +03:00
Kuroshini
0da58133fc Fix news patch 2019-12-26 18:34:59 +03:00
Dmitriy Kuzmenko
02d0112d8b add export for guides 2019-12-26 18:11:48 +03:00
alex
396921fa75 fix GM-318 2019-12-26 16:02:17 +03:00
Kuroshini
7648e478f5 allow city main image changing 2019-12-26 15:00:05 +03:00
littlewolf
2651ad1a29 Add order 2019-12-26 14:19:26 +03:00
alex
668bc92b97 fix print 2019-12-26 10:45:17 +03:00
alex
0152538333 author for review text 2019-12-26 10:33:27 +03:00
Anatoly
1189b6ff58 see changes 2019-12-26 10:24:08 +03:00