Commit Graph

1994 Commits

Author SHA1 Message Date
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
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
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
d.kuzmenko
2c399cb30d Merge branch 'fix/user-role-err' into 'develop'
Fix/user role err

See merge request gm/gm-backend!160
2019-12-03 12:46:28 +00:00
Виктор Гладких
933f21cdaa Merge branch 'develop' into fix/user-role-err 2019-12-03 15:36:41 +03:00
d.kuzmenko
99f46c3c39 Merge branch 'feature/site-feature-api' into 'develop'
Feature/site feature api

See merge request gm/gm-backend!163
2019-12-03 12:34:07 +00: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
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