Commit Graph

2089 Commits

Author SHA1 Message Date
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
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
d.kuzmenko
2c04d08316 Merge branch 'feature/api_sites_settings_features' into 'develop'
Feature/api sites settings features

See merge request gm/gm-backend!162
2019-12-02 15:14:47 +00:00
evgeniy-st
69dbaf40dc update Dockerfile 2019-12-02 18:05:57 +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