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 |
|
Kuroshini
|
7635eafb09
|
booking urls for mobile
(cherry picked from commit 0df3425)
|
2019-12-06 13:11:58 +03:00 |
|
Anatoly
|
b659308729
|
exclude field from Establishment serializer
|
2019-12-06 13:06:59 +03:00 |
|
Виктор Гладких
|
8c8acd3e19
|
Models
|
2019-12-06 11:13:07 +03:00 |
|
alex
|
48ae6a437d
|
street_name_2 clear
|
2019-12-06 10:29:43 +03:00 |
|
Виктор Гладких
|
cbf998569a
|
Merge branch 'develop' into feature/permission_winery
|
2019-12-06 09:46:29 +03:00 |
|
Виктор Гладких
|
88b190d76d
|
winery choice
|
2019-12-06 09:45:38 +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
|
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 |
|
Виктор Гладких
|
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 |
|
Виктор Гладких
|
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 |
|
Виктор Гладких
|
933f21cdaa
|
Merge branch 'develop' into fix/user-role-err
|
2019-12-03 15:36:41 +03:00 |
|
Виктор Гладких
|
4becc39b3e
|
Merge branch 'develop' into feature/site-feature-api
|
2019-12-03 15:26:30 +03:00 |
|
Виктор Гладких
|
5ecb5d214b
|
Old role migrate1
|
2019-12-03 15:24:02 +03:00 |
|
Виктор Гладких
|
f5d5ce922f
|
Old role migrate
|
2019-12-03 15:23:41 +03:00 |
|
Dmitriy Kuzmenko
|
637903e613
|
fix scheduler
|
2019-12-03 15:15:02 +03:00 |
|
Kuroshini
|
476b3fe059
|
Merge remote-tracking branch 'origin/fix/geo-calculate-center' into develop
|
2019-12-03 14:45:01 +03:00 |
|
dormantman
|
e7de51373d
|
Correction of finding the visual center of points
|
2019-12-03 14:39:25 +03:00 |
|
littlewolf
|
93056cf524
|
Add filter
Add queryset
Add settings
|
2019-12-03 13:35:52 +03:00 |
|
Kuroshini
|
201e02b4b7
|
remove empty favs
|
2019-12-03 13:29:37 +03:00 |
|
Kuroshini
|
4b9561fe75
|
Fix typo
|
2019-12-03 11:50:36 +03:00 |
|
Виктор Гладких
|
55d3779d5f
|
Merge branch 'develop' into feature/site-feature-api
|
2019-12-03 10:21:49 +03:00 |
|
Виктор Гладких
|
fdc63f2677
|
Add API methods for site-feature
|
2019-12-03 10:20:13 +03:00 |
|
Dmitriy Kuzmenko
|
b6d0815ed0
|
add news author migration
|
2019-12-03 09:59:11 +03:00 |
|
Kuroshini
|
ed28ea1767
|
Fix missing tags
|
2019-12-02 22:10:38 +03:00 |
|
Kuroshini
|
e40156908b
|
Artisan category tags for establishments
|
2019-12-02 21:38:21 +03:00 |
|
Kuroshini
|
e981b48fa0
|
Fix extra tags indexing
|
2019-12-02 21:32:03 +03:00 |
|
Kuroshini
|
140ba040e7
|
Extra fields for establishments
|
2019-12-02 21:26:55 +03:00 |
|
dormantman
|
4d54c84b51
|
Removed rounding of coordinates
|
2019-12-02 20:52:32 +03:00 |
|
dormantman
|
ab2304a6fa
|
Fixed a bug related to inaccurate calc of the visual center of the map
|
2019-12-02 20:50:47 +03:00 |
|
Kuroshini
|
3b05a552aa
|
Tz field for establishments
(cherry picked from commit a537f04)
|
2019-12-02 18:37:16 +03:00 |
|
Виктор Гладких
|
e02db4958a
|
Add feature serializer
|
2019-12-02 17:40:01 +03:00 |
|
Виктор Гладких
|
a72deaec37
|
Site site settings
|
2019-12-02 17:24:51 +03:00 |
|
Виктор Гладких
|
d439c081fc
|
Merge branch 'develop' into fix/user-role-err
|
2019-12-02 15:13:38 +03:00 |
|
Виктор Гладких
|
6d9686b64a
|
Fix error
|
2019-12-02 15:12:17 +03:00 |
|
Kuroshini
|
b3d01c8887
|
Fix booking #2
|
2019-12-02 15:06:43 +03:00 |
|
Kuroshini
|
cbe6a25d79
|
Fix booking
|
2019-12-02 14:42:33 +03:00 |
|
Kuroshini
|
5ee7c314c0
|
Fix product document serialization
|
2019-12-02 14:31:24 +03:00 |
|
Kuroshini
|
b868efb137
|
order bu created
|
2019-12-02 14:28:01 +03:00 |
|
Kuroshini
|
c492ec530b
|
Fix typo
|
2019-12-02 13:59:03 +03:00 |
|
Kuroshini
|
5b11b6b8fc
|
Add created to products search results
|
2019-12-02 13:52:53 +03:00 |
|
Anatoly
|
076d14fd5b
|
added filter model
|
2019-12-02 13:51:48 +03:00 |
|
Kuroshini
|
fccffa93e3
|
Order news by -start
|
2019-12-02 12:45:58 +03:00 |
|
alex
|
20b3e7f461
|
status display field
|
2019-12-02 12:07:24 +03:00 |
|
Kuroshini
|
a9d45ab7bb
|
Start news field s timefield
|
2019-11-29 18:43:41 +03:00 |
|
Kuroshini
|
530b7e2ab6
|
Fix search aggs
|
2019-11-29 18:31:17 +03:00 |
|
Anatoly
|
4e3a990ac6
|
added command to fix existed collections
|
2019-11-29 16:44:32 +03:00 |
|