d.kuzmenko
|
357b3fdaa5
|
Merge branch 'feature/permission' into 'develop'
Feature/permission
See merge request gm/gm-backend!156
|
2019-11-25 14:07:00 +00: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 |
|
Олег Хаятов
|
13a8848eef
|
Merge branch 'feature/bo_establishment_employee_features' into 'develop'
Feature/bo establishment employee features
See merge request gm/gm-backend!154
|
2019-11-25 12:15:51 +00: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 |
|
Kuroshini
|
a660ffcc31
|
static to Amazon #2
|
2019-11-25 14:26:37 +03:00 |
|
Kuroshini
|
49c6dc8f1d
|
static to Amazon
|
2019-11-25 14:21:05 +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 |
|
d.kuzmenko
|
39b9b2b7e9
|
Merge branch 'feature/bo_employee_update' into 'develop'
Feature/bo employee update
See merge request gm/gm-backend!119
|
2019-11-22 14:21:25 +00: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 |
|
Олег Хаятов
|
801f5fce24
|
Merge branch 'feature/back_news_serializer_fix' into 'develop'
Changed in_favorites field to read only
See merge request gm/gm-backend!147
|
2019-11-22 11:46:24 +00: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 |
|
evgeniy-st
|
ce41b96ec3
|
update dev settings
|
2019-11-22 12:34:11 +03:00 |
|
Виктор Гладких
|
806a7d63e4
|
Migrate
|
2019-11-22 11:43:22 +03:00 |
|