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 |
|
dormantman
|
72d52e5c19
|
Removed unusable destroy function
|
2019-12-04 15:51:03 +03:00 |
|
dormantman
|
4202eb679b
|
Corrections for tests
|
2019-12-04 15:48:54 +03:00 |
|
Anatoly
|
627f7562ec
|
finalizing transfer guides
|
2019-12-04 14:21:54 +03:00 |
|
Kuroshini
|
552e08e242
|
opening_at for establishment
|
2019-12-04 13:52:39 +03:00 |
|
Kuroshini
|
c5992afec0
|
add opening_at to schedule search results
|
2019-12-04 13:50:55 +03:00 |
|
dormantman
|
a81f3f079a
|
Changed url id to slug in back-office
|
2019-12-04 13:37:49 +03:00 |
|
Dmitriy Kuzmenko
|
9f5a1f9ce5
|
Merge branch 'tags_filter' into develop
|
2019-12-04 12:46:17 +03:00 |
|
Dmitriy Kuzmenko
|
4d36fc0f0c
|
fix fabric
|
2019-12-04 12:38:07 +03:00 |
|
d.kuzmenko
|
49d64d2878
|
Merge branch 'migrate/site-affilations' into 'develop'
Migrate/site affilations
See merge request gm/gm-backend!168
|
2019-12-04 09:34:44 +00:00 |
|
Виктор Гладких
|
e7deab5bbc
|
Merge branch 'develop' into migrate/site-affilations
|
2019-12-04 12:25:32 +03:00 |
|
Виктор Гладких
|
96e08a0900
|
Migrate complete
|
2019-12-04 12:24:23 +03:00 |
|
alex
|
7590a73c5d
|
tags fix mtm
|
2019-12-04 09:23:21 +03:00 |
|
Kuroshini
|
f507994014
|
tags dynamic filters #5 (add wine-colors)
|
2019-12-04 00:49:46 +03:00 |
|
Kuroshini
|
9f882ca656
|
tags dynamic filters #4 (boost search via ES)
|
2019-12-04 00:33:18 +03:00 |
|
Kuroshini
|
f9fb2aa17e
|
tags dynamic filters #4
|
2019-12-03 23:49:45 +03:00 |
|
Kuroshini
|
eaf5c41e1d
|
tags dynamic filters #4
|
2019-12-03 22:53:31 +03:00 |
|
Kuroshini
|
9c84842c11
|
tags dynamic filters #3
|
2019-12-03 22:35:38 +03:00 |
|
Kuroshini
|
013cd864c2
|
tags dynamic filters #2
|
2019-12-03 20:48:35 +03:00 |
|
Kuroshini
|
c00075feec
|
empty booking response
|
2019-12-03 19:39:20 +03:00 |
|
alex
|
7596652a3f
|
category tag tags filter by obj type
|
2019-12-03 19:31:05 +03:00 |
|
Kuroshini
|
848008cae1
|
tags dynamic filters
|
2019-12-03 19:26:37 +03:00 |
|
d.kuzmenko
|
11ed52b557
|
Merge branch 'fix/slug-site-settings' into 'develop'
fix
See merge request gm/gm-backend!167
|
2019-12-03 15:33:55 +00:00 |
|
Виктор Гладких
|
7cf34f0741
|
fix
|
2019-12-03 18:30:33 +03:00 |
|
Виктор Гладких
|
cc7754a9d7
|
Old role migrate1
|
2019-12-03 17:58:46 +03:00 |
|
Kuroshini
|
0e6b5e3067
|
Merge remote-tracking branch 'origin/fix/geo-calculate-center' into develop
|
2019-12-03 17:20:16 +03:00 |
|
dormantman
|
fee8a3b120
|
Correction of finding the center of points with positive
|
2019-12-03 17:16:02 +03:00 |
|
Виктор Гладких
|
4797225beb
|
model
|
2019-12-03 16:40:50 +03:00 |
|
Dmitriy Kuzmenko
|
ba61dbd0e5
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-12-03 15:54:30 +03:00 |
|
Dmitriy Kuzmenko
|
4940a4472d
|
add additional fields to UserBaseSerializer
|
2019-12-03 15:54:15 +03:00 |
|