Commit Graph

1780 Commits

Author SHA1 Message Date
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