Dmitriy Kuzmenko
|
f6cb62c49c
|
Merge branch 'develop' into fix/check_tags
|
2019-12-09 12:06:37 +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 |
|
Kuroshini
|
bdb82d0fb0
|
add migration command
|
2019-12-06 16:40:39 +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 |
|
Anatoly
|
c272dc1255
|
increase JWT token lifetime
|
2019-12-06 13:15:35 +03:00 |
|
Kuroshini
|
7635eafb09
|
booking urls for mobile
(cherry picked from commit 0df3425)
|
2019-12-06 13:11:58 +03:00 |
|
alex
|
48ae6a437d
|
street_name_2 clear
|
2019-12-06 10:29:43 +03:00 |
|
alex
|
5d76e8a02b
|
fix address command
|
2019-12-06 08:20:23 +03:00 |
|
Dmitriy Kuzmenko
|
c3c0032074
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-05 17:19:49 +03:00 |
|
Dmitriy Kuzmenko
|
73c66c7357
|
add_publick_mark
|
2019-12-05 17:19:38 +03:00 |
|
Kuroshini
|
202f5715f3
|
remove tag category from detail
|
2019-12-05 17:12:43 +03:00 |
|
Dmitriy Kuzmenko
|
c62b4016f1
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-05 15:23:24 +03:00 |
|
Dmitriy Kuzmenko
|
f06596b5b6
|
fix review
|
2019-12-05 15:23:16 +03:00 |
|
Kuroshini
|
f9479dd7a6
|
calc center again
|
2019-12-05 14:30:41 +03:00 |
|
Kuroshini
|
aa8304acaf
|
Revert "try another calc strategy"
This reverts commit fe101f3
|
2019-12-05 14:19:56 +03:00 |
|
Kuroshini
|
fe101f3cb0
|
try another calc strategy
(cherry picked from commit 9ab17f7)
|
2019-12-05 14:17:12 +03:00 |
|
Anatoly
|
3afb51d472
|
fix establishment admin page
|
2019-12-05 14:11:54 +03:00 |
|
Kuroshini
|
3e7922e0fc
|
temp fix
|
2019-12-05 13:30:43 +03:00 |
|
Kuroshini
|
66fc2fae99
|
Revert "possible fix center calculation"
This reverts commit ca80f7a
|
2019-12-05 13:15:51 +03:00 |
|
Kuroshini
|
ca80f7a797
|
possible fix center calculation
|
2019-12-05 13:14:27 +03:00 |
|
Kuroshini
|
1e0044cbd1
|
artisans tags for favs
(cherry picked from commit 7081e52)
|
2019-12-05 12:12:08 +03:00 |
|
Anatoly
|
d114b93b14
|
fix es for products
|
2019-12-05 09:48:09 +03:00 |
|
Anatoly
|
1d9ee76a5c
|
fix es for establishments
|
2019-12-05 09:43:55 +03:00 |
|
Kuroshini
|
bebd1283c0
|
Merge remote-tracking branch 'origin/fix/hide-unused-tags' into develop
# Conflicts:
# apps/establishment/models.py
|
2019-12-04 21:04:09 +03:00 |
|
dormantman
|
c0bc66c749
|
Hide unusable tags
|
2019-12-04 21:02:08 +03:00 |
|
Anatoly
|
1da7c40a9d
|
fix merge
|
2019-12-04 20:18:47 +03:00 |
|
Anatoly
|
9dc8e34e3a
|
Merge branch 'develop' into feature/transfer-guide
# Conflicts:
# apps/establishment/models.py
# apps/establishment/serializers/common.py
|
2019-12-04 20:16:21 +03:00 |
|
Anatoly
|
29ff10fb4b
|
added wine origins
|
2019-12-04 20:13:09 +03:00 |
|
Kuroshini
|
f44a4bb29d
|
Establishments favs type
|
2019-12-04 19:37:05 +03:00 |
|
Kuroshini
|
e0ad819caa
|
fix empty comments
|
2019-12-04 18:51:23 +03:00 |
|
d.kuzmenko
|
6d80678564
|
Merge branch 'feature/eest_empl_options' into 'develop'
Fix options
See merge request gm/gm-backend!170
|
2019-12-04 15:47:42 +00:00 |
|
Kuroshini
|
69b40f21b7
|
last comment for mobile establishment detail
|
2019-12-04 18:26:03 +03:00 |
|
Kuroshini
|
dee353199d
|
add schedule to establishments list
|
2019-12-04 17:31:02 +03:00 |
|
dormantman
|
234f21e03b
|
Merge remote-tracking branch 'origin/develop' into fix/hide-excess-tags
|
2019-12-04 17:29:24 +03:00 |
|
Виктор Гладких
|
d0378ad14e
|
Fix options
|
2019-12-04 17:27:51 +03:00 |
|
dormantman
|
1ae11f0b61
|
System tags removed
|
2019-12-04 17:27:49 +03:00 |
|
Kuroshini
|
b2fb341c10
|
fix wines faceted search
|
2019-12-04 17:13:38 +03:00 |
|