Commit Graph

1780 Commits

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