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
|
202f5715f3
|
remove tag category from detail
|
2019-12-05 17:12:43 +03:00 |
|
Anatoly
|
3afb51d472
|
fix establishment admin page
|
2019-12-05 14:11:54 +03:00 |
|
Kuroshini
|
1e0044cbd1
|
artisans tags for favs
(cherry picked from commit 7081e52)
|
2019-12-05 12:12:08 +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 |
|
Виктор Гладких
|
d0378ad14e
|
Fix options
|
2019-12-04 17:27:51 +03:00 |
|
dormantman
|
1ae11f0b61
|
System tags removed
|
2019-12-04 17:27:49 +03:00 |
|
dormantman
|
4202eb679b
|
Corrections for tests
|
2019-12-04 15:48:54 +03:00 |
|
dormantman
|
a81f3f079a
|
Changed url id to slug in back-office
|
2019-12-04 13:37:49 +03:00 |
|
Dmitriy Kuzmenko
|
637903e613
|
fix scheduler
|
2019-12-03 15:15:02 +03:00 |
|
Kuroshini
|
4b9561fe75
|
Fix typo
|
2019-12-03 11:50:36 +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 |
|
Kuroshini
|
3b05a552aa
|
Tz field for establishments
(cherry picked from commit a537f04)
|
2019-12-02 18:37:16 +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 |
|
alex
|
9b35da1eca
|
add artisan subtype
|
2019-11-27 17:03:27 +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 |
|
alex
|
49e5e4ea91
|
test establishment and news carousel
|
2019-11-25 09:38:50 +03:00 |
|
Kuroshini
|
586f2a7a03
|
boost detail establishment speed
(cherry picked from commit c2bb9f0)
|
2019-11-22 18:22:41 +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 |
|
evgeniy-st
|
f95a082db3
|
update geoip feature
|
2019-11-22 16:00:06 +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 |
|
Anatoly
|
617552841f
|
refactored product, fix transfer and etc., see changelist
|
2019-11-21 09:58:43 +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 |
|
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
|
10579843af
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-11-19 18:29:20 +03:00 |
|
Anatoly
|
9975f3f3b5
|
added bo endpoints for product notes
|
2019-11-19 18:28:53 +03:00 |
|