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 |
|
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 |
|
Kuroshini
|
a102b68173
|
News start field is nullable now
|
2019-11-29 16:22:02 +03:00 |
|
Kuroshini
|
aebdb0fb20
|
Add id field to api/web/main/site-settings/{domain}
|
2019-11-29 15:50:42 +03:00 |
|
Kuroshini
|
376f815c97
|
Order within bounding box from center
|
2019-11-29 14:37:10 +03:00 |
|
Anatoly
|
52872ce364
|
updated
|
2019-11-29 14:09:00 +03:00 |
|
Kuroshini
|
1a57d0edd8
|
Paginator custom facets code optimization
|
2019-11-29 13:46:20 +03:00 |
|
Anatoly
|
0fb28467fb
|
updated serializer
|
2019-11-29 13:26:05 +03:00 |
|
alex
|
4f6cbb7684
|
ReviewBackSerializer
|
2019-11-29 09:55:06 +03:00 |
|
Kuroshini
|
678377c234
|
Fix issue w/ tags #3
|
2019-11-28 23:43:18 +03:00 |
|
Kuroshini
|
846176131e
|
Fix issue w/ tags #2
|
2019-11-28 23:33:09 +03:00 |
|
Kuroshini
|
e924b359c8
|
Fix issue w/ tags
|
2019-11-28 22:55:52 +03:00 |
|
Kuroshini
|
02cacc0ffe
|
Fix issue with immutable instances
|
2019-11-28 22:38:26 +03:00 |
|
Kuroshini
|
9cf82f03fe
|
Another agg ES response strategy #2
|
2019-11-28 21:31:12 +03:00 |
|
Kuroshini
|
68626e9fd5
|
Another agg ES response strategy
|
2019-11-28 21:24:47 +03:00 |
|
Kuroshini
|
9b02b855d6
|
Revert "All facets are global now"
This reverts commit 03b7ae6
|
2019-11-28 21:24:47 +03:00 |
|
Anatoly
|
5660c20d50
|
added id field to site BO serializers
|
2019-11-28 18:52:57 +03:00 |
|
Anatoly
|
41611c5b9b
|
added sites to back office endpoints
|
2019-11-28 18:37:12 +03:00 |
|
alex
|
6df9ffb024
|
add review priority fin
|
2019-11-28 16:56:15 +03:00 |
|
alex
|
9c59052e0b
|
add review priority command start
|
2019-11-28 15:55:24 +03:00 |
|
alex
|
2cca32e4cf
|
mark in review back serializer
|
2019-11-28 15:37:26 +03:00 |
|
Anatoly
|
eaeebae72a
|
in progress
|
2019-11-28 15:31:47 +03:00 |
|
alex
|
c81dbf2d8e
|
main back test
|
2019-11-28 15:29:42 +03:00 |
|
alex
|
5a3093be51
|
content type get api
|
2019-11-28 15:19:13 +03:00 |
|
alex
|
a8ff626179
|
ReviewBackSerializer
|
2019-11-28 15:10:40 +03:00 |
|
Kuroshini
|
03b7ae678e
|
All facets are global now
|
2019-11-28 14:59:41 +03:00 |
|
Kuroshini
|
f225336121
|
Remove facets from mobile
|
2019-11-28 14:45:52 +03:00 |
|
Kuroshini
|
4bc3af29a0
|
Fix booking
|
2019-11-28 14:24:39 +03:00 |
|
Kuroshini
|
19190eb1e0
|
Fix hardcoded tags
(cherry picked from commit 4e5291d)
|
2019-11-28 14:00:51 +03:00 |
|
alex
|
749c4a637b
|
artisan subtype fix
|
2019-11-28 09:19:53 +03:00 |
|
alex
|
78d4145336
|
artisan subtype
|
2019-11-28 09:13:38 +03:00 |
|
littlewolf
|
c2e111f75b
|
Fix queryset
|
2019-11-27 18:12:22 +03:00 |
|
alex
|
9b35da1eca
|
add artisan subtype
|
2019-11-27 17:03:27 +03:00 |
|
Semyon Yekhmenin
|
883b214d74
|
Added is_international property to news
|
2019-11-27 12:49:33 +00:00 |
|
Kuroshini
|
ca7d7f0fa8
|
return only wine-color tags
|
2019-11-27 13:57:12 +03:00 |
|
Kuroshini
|
f19aaf3f4c
|
Wine colors search
|
2019-11-26 18:54:54 +03:00 |
|
Kuroshini
|
cc5763136b
|
Wine colors establishment facet
|
2019-11-26 18:50:52 +03:00 |
|
Kuroshini
|
8c83e7d1c6
|
Revert "Fix wine colors facet"
This reverts commit 7bc93d5
|
2019-11-26 18:41:42 +03:00 |
|
Kuroshini
|
7bc93d55d7
|
Fix wine colors facet
|
2019-11-26 18:38:49 +03:00 |
|
Anatoly
|
8d4de46496
|
commenting out GuideElements and GuideSections from transfer models
|
2019-11-26 17:02:33 +03:00 |
|
Виктор Гладких
|
62b7befda7
|
SiteFeatures migrate
|
2019-11-26 15:45:11 +03:00 |
|
Kuroshini
|
26867bc2bb
|
Unlimited facets for search results
(cherry picked from commit 1dac727)
|
2019-11-25 18:47:20 +03:00 |
|
Виктор Гладких
|
420c673afd
|
Fix
|
2019-11-25 16:52:27 +03:00 |
|
Виктор Гладких
|
82d3b152c7
|
Fix test
|
2019-11-25 16:46:53 +03:00 |
|
Виктор Гладких
|
08d624db05
|
Fix schedule test and permissions
|
2019-11-25 16:19:38 +03:00 |
|
Semyon Yekhmenin
|
1711057cee
|
Feature/bo establishment employee features
|
2019-11-25 12:15:51 +00:00 |
|
alex
|
17f67d020a
|
back carousel api and test
|
2019-11-25 15:00:53 +03:00 |
|
Виктор Гладких
|
842ad47ec0
|
Fix test translated
|
2019-11-25 14:34:57 +03:00 |
|
Виктор Гладких
|
43fc16f841
|
Fix country test
|
2019-11-25 12:29:53 +03:00 |
|
Виктор Гладких
|
28a3e022f6
|
Fix comment test and permission
|
2019-11-25 12:13:14 +03:00 |
|
Виктор Гладких
|
86500b6b88
|
Fix site_id for comment
|
2019-11-25 11:13:05 +03:00 |
|
Виктор Гладких
|
29782fe876
|
Fix
|
2019-11-25 10:45:57 +03:00 |
|
Виктор Гладких
|
6bb0eac409
|
Fix establishment timetable serailizer for permission
|
2019-11-25 10:45:20 +03:00 |
|
Виктор Гладких
|
13eb8abac6
|
fix country or site
|
2019-11-25 09:49:17 +03:00 |
|
alex
|
49e5e4ea91
|
test establishment and news carousel
|
2019-11-25 09:38:50 +03:00 |
|
Виктор Гладких
|
58db94e2d0
|
Permission
|
2019-11-25 09:33:22 +03:00 |
|
Anatoly
|
9b61ff3114
|
added COOKIE_DOMAIN parameter to settings
|
2019-11-23 14:58:49 +03:00 |
|
Anatoly
|
d9743d8465
|
refactored serializer
|
2019-11-22 22:48:26 +03:00 |
|
Dmitriy Kuzmenko
|
4fdc32ea04
|
Merge branch 'feature/crop-params' of ssh://gl.id-east.ru:222/gm/gm-backend into feature/crop-params
|
2019-11-22 19:21:28 +03:00 |
|
Dmitriy Kuzmenko
|
797327802b
|
Merge remote-tracking branch 'origin/develop' into feature/crop-params
|
2019-11-22 19:21:16 +03:00 |
|
Anatoly
|
65bb22bb21
|
reassign sorl-thumbnail engine
|
2019-11-22 19:04:47 +03:00 |
|
Dmitriy Kuzmenko
|
193a7ae29d
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-22 18:34:01 +03:00 |
|
Dmitriy Kuzmenko
|
c83c07b9e1
|
add site features inline admin
|
2019-11-22 18:33:39 +03:00 |
|
Kuroshini
|
586f2a7a03
|
boost detail establishment speed
(cherry picked from commit c2bb9f0)
|
2019-11-22 18:22:41 +03:00 |
|
Kuroshini
|
c2bb9f0814
|
boost detail establishment speed
|
2019-11-22 18:21:37 +03:00 |
|
Semyon Yekhmenin
|
e565406729
|
Feature/bo employee update
|
2019-11-22 14:21:25 +00:00 |
|
alex
|
a5d5dc1335
|
establishment carousel web and mobile api
|
2019-11-22 17:13:41 +03:00 |
|
alex
|
fa183bfc92
|
carousel back api url
|
2019-11-22 17:00:43 +03:00 |
|
alex
|
7e878956e3
|
carousel api for news
|
2019-11-22 16:22:31 +03:00 |
|
evgeniy-st
|
99f01464b7
|
Merge branch 'develop' into feature/crop-params
|
2019-11-22 16:08:42 +03:00 |
|
Виктор Гладких
|
e3420d571e
|
Contentpage permission in news
|
2019-11-22 16:05:02 +03:00 |
|
Виктор Гладких
|
376c8cdff3
|
State test news with contentpage permission
|
2019-11-22 16:00:59 +03:00 |
|
evgeniy-st
|
f95a082db3
|
update geoip feature
|
2019-11-22 16:00:06 +03:00 |
|
Виктор Гладких
|
e0352b7d93
|
Back news permissions
|
2019-11-22 15:46:59 +03:00 |
|
alex
|
429825804a
|
create destroy mixin
|
2019-11-22 15:07:50 +03:00 |
|
Kuroshini
|
64ac1d2578
|
Merge branch 'develop' into feature/crop-params
|
2019-11-22 14:47:16 +03:00 |
|
Anatoly
|
844c8525e9
|
refactored, add endpoint - /api/back/gallery/<pk>/crop/
|
2019-11-22 14:46:45 +03:00 |
|
Semyon Yekhmenin
|
120e686be6
|
Changed in_favorites field to read only
|
2019-11-22 11:46:24 +00:00 |
|
Kuroshini
|
0231f97709
|
Establishment facet visibble tags only
(cherry picked from commit 59f44d8)
|
2019-11-22 14:28:45 +03:00 |
|
Kuroshini
|
59f44d84f1
|
Establishment facet visibble tags only
|
2019-11-22 14:27:40 +03:00 |
|
Kuroshini
|
17931eba53
|
Facet with tags id instead of text values
(cherry picked from commit 2ebe6e6)
|
2019-11-22 13:55:56 +03:00 |
|
Kuroshini
|
2ebe6e60a3
|
Facet with tags id instead of text values
|
2019-11-22 13:54:07 +03:00 |
|
Anatoly
|
f7703f18b0
|
refactored upload image endpoint
|
2019-11-22 13:02:04 +03:00 |
|
evgeniy-st
|
00d7bbe7ec
|
update crontab parameters
|
2019-11-22 12:45:14 +03:00 |
|
Виктор Гладких
|
806a7d63e4
|
Migrate
|
2019-11-22 11:43:22 +03:00 |
|
Kuroshini
|
a758cad48f
|
Fix f swagger
|
2019-11-22 11:11:39 +03:00 |
|
Виктор Гладких
|
3a1e55ba1f
|
Site settings migrate data
|
2019-11-22 10:58:07 +03:00 |
|
Виктор Гладких
|
f52cc8eccc
|
Merge branch 'develop' into migrate/site_settings
|
2019-11-22 10:38:50 +03:00 |
|
Виктор Гладких
|
ee781150fd
|
Site settings
|
2019-11-22 10:38:03 +03:00 |
|
alex
|
d30d68bf17
|
partner test
|
2019-11-22 10:32:01 +03:00 |
|
Kuroshini
|
7e6b2712a9
|
Fix facet
|
2019-11-22 10:24:05 +03:00 |
|
Kuroshini
|
0fe3e3f8ba
|
Fix
|
2019-11-22 10:17:34 +03:00 |
|
alex
|
22e1478a1f
|
partner back api
|
2019-11-22 09:31:21 +03:00 |
|
Kuroshini
|
735e409734
|
Facets for products
|
2019-11-21 22:54:33 +03:00 |
|
Kuroshini
|
9f1e9effaf
|
Facets for news
|
2019-11-21 22:46:49 +03:00 |
|
Kuroshini
|
7376c61c47
|
Facets for establishments
|
2019-11-21 22:43:10 +03:00 |
|
Kuroshini
|
e6b353e864
|
ES Facets in addition to results
|
2019-11-21 21:59:24 +03:00 |
|
evgeniy-st
|
04d6412f39
|
Merge branch 'develop' into feature/in_favorites
|
2019-11-21 18:18:09 +03:00 |
|
evgeniy-st
|
35b6a66c85
|
In favorites
|
2019-11-21 18:12:52 +03:00 |
|
Semyon Yekhmenin
|
4209b38d93
|
Fixed is_published filed type in serializer
|
2019-11-21 14:46:56 +00:00 |
|
Semyon Yekhmenin
|
98e140b0c4
|
Feature/news web view update
|
2019-11-21 14:12:22 +00:00 |
|
alex
|
86e29173ba
|
transfer partner
|
2019-11-21 16:45:27 +03:00 |
|
Kuroshini
|
8e215b2555
|
Demonstration carousel item
|
2019-11-21 16:40:53 +03:00 |
|
Виктор Гладких
|
26b8dcd082
|
Check serial number command
|
2019-11-21 15:26:43 +03:00 |
|
Виктор Гладких
|
5236bca874
|
Check serial number command
|
2019-11-21 15:22:43 +03:00 |
|
Виктор Гладких
|
a2087213a4
|
Check serial number command
|
2019-11-21 15:22:22 +03:00 |
|
Виктор Гладких
|
9acb9e4a22
|
Merge branch 'develop' into fix/check_tags
|
2019-11-21 14:34:01 +03:00 |
|
Виктор Гладких
|
9a2f7fec39
|
fix
|
2019-11-21 14:33:27 +03:00 |
|
alex
|
9156d9cc35
|
fix partner migrations
|
2019-11-21 14:00:17 +03:00 |
|
alex
|
a6bfb3ea6b
|
partner migrations
|
2019-11-21 13:47:37 +03:00 |
|
alex
|
d9b88f7ef9
|
partner name field
|
2019-11-21 13:32:50 +03:00 |
|
Виктор Гладких
|
938b9436eb
|
Fix name def
|
2019-11-21 13:25:31 +03:00 |
|
Виктор Гладких
|
1687e80492
|
Check serial number for product
|
2019-11-21 13:13:19 +03:00 |
|
Anatoly
|
3f164459a7
|
added transfer for filling city gallery
|
2019-11-21 12:37:13 +03:00 |
|
alex
|
e6a143f6ea
|
partner model
|
2019-11-21 12:29:55 +03:00 |
|
alex
|
bebdf1e269
|
review test and fixes review crud api
|
2019-11-21 11:12:52 +03:00 |
|
Anatoly
|
e303e15f32
|
added two characteristics to wine detail serializer
|
2019-11-21 10:28:17 +03:00 |
|
Anatoly
|
617552841f
|
refactored product, fix transfer and etc., see changelist
|
2019-11-21 09:58:43 +03:00 |
|
alex
|
a2a8b2927f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-21 09:12:00 +03:00 |
|
alex
|
cad0f8df0a
|
award test
|
2019-11-21 09:11:52 +03:00 |
|
Dmitriy Kuzmenko
|
009ecf1973
|
fix filter for tag_category
|
2019-11-21 08:42:05 +03:00 |
|
Dmitriy Kuzmenko
|
74c1b7069a
|
fix product tags
|
2019-11-21 00:23:17 +03:00 |
|
Kuroshini
|
2dc7f1e89d
|
Boost the tempo
|
2019-11-20 20:35:56 +03:00 |
|
Kuroshini
|
06b8582976
|
Revert "Estabishment_type field"
This reverts commit 280da2d
|
2019-11-20 19:41:22 +03:00 |
|
Kuroshini
|
49940ebab4
|
Revert "Estabishment_type field #2"
This reverts commit b60dd87
|
2019-11-20 19:41:20 +03:00 |
|
Kuroshini
|
b60dd870f9
|
Estabishment_type field #2
|
2019-11-20 19:32:45 +03:00 |
|
Kuroshini
|
280da2d7de
|
Estabishment_type field
|
2019-11-20 19:31:43 +03:00 |
|
Kuroshini
|
cd328186e1
|
wildcard boosting
|
2019-11-20 17:01:24 +03:00 |
|
alex
|
45fee0355c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-11-20 16:38:22 +03:00 |
|
alex
|
824cbe203b
|
award back api
|
2019-11-20 16:38:11 +03:00 |
|
Dmitriy Kuzmenko
|
15ddbd5a7e
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-20 16:29:57 +03:00 |
|
Dmitriy Kuzmenko
|
2e17d7265d
|
add back api for collection
|
2019-11-20 16:29:46 +03:00 |
|
alex
|
7ba3913000
|
award filter
|
2019-11-20 16:17:49 +03:00 |
|
evgeniy-st
|
bea485f936
|
city may be null
|
2019-11-20 15:56:56 +03:00 |
|
d.kuzmenko
|
62d7f13f80
|
Merge branch 'fix/tags_many' into 'develop'
Fix/tags many
See merge request gm/gm-backend!143
|
2019-11-20 12:43:05 +00:00 |
|
Kuroshini
|
cf22027dc1
|
Search by wildcard
|
2019-11-20 15:40:10 +03:00 |
|
Виктор Гладких
|
5a55fa82a2
|
Codestyle
|
2019-11-20 15:32:36 +03:00 |
|
Виктор Гладких
|
c570cfdadd
|
Fix
|
2019-11-20 15:29:03 +03:00 |
|
Kuroshini
|
be581c7b7d
|
Dynamic front filters #1
|
2019-11-20 14:15:25 +03:00 |
|
Anatoly
|
ef1af8c3ac
|
added city gallery
|
2019-11-20 13:27:26 +03:00 |
|
alex
|
2f6d0cf4ed
|
review filter fix
|
2019-11-20 13:00:50 +03:00 |
|
alex
|
61e049f5c3
|
review filter by product id
|
2019-11-20 12:56:57 +03:00 |
|
Anatoly
|
d3faacba3b
|
fix product view mixins
|
2019-11-20 12:41:43 +03:00 |
|
evgeniy-st
|
0639aee494
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-20 12:24:41 +03:00 |
|
evgeniy-st
|
7f8f72815e
|
append city or country to ProductDocumentSerialzier
|
2019-11-20 12:21:55 +03:00 |
|
Anatoly
|
0e6a4eded2
|
fixed transfer_product_reviews
|
2019-11-20 12:10:28 +03:00 |
|
Anatoly
|
498e8ac126
|
fix product country filter in ES
|
2019-11-20 11:56:31 +03:00 |
|
a.feteleu
|
d932df4392
|
add unknown migrations from developm server:-(
|
2019-11-20 10:07:23 +03:00 |
|
a.feteleu
|
8e01c2092d
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-20 09:43:58 +03:00 |
|
Anatoly
|
1a1a2a2d24
|
added bo endpoints for establishment notes
|
2019-11-20 09:43:45 +03:00 |
|
a.feteleu
|
41b43b7d55
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-20 09:26:57 +03:00 |
|