Commit Graph

211 Commits

Author SHA1 Message Date
Kuroshini
b5a113c875 user last visit middleware 2019-12-06 18:53:40 +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
dormantman
a81f3f079a Changed url id to slug in back-office 2019-12-04 13:37:49 +03:00
Kuroshini
68626e9fd5 Another agg ES response strategy 2019-11-28 21:24:47 +03:00
Виктор Гладких
420c673afd Fix 2019-11-25 16:52:27 +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
Виктор Гладких
842ad47ec0 Fix test translated 2019-11-25 14:34:57 +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
Виктор Гладких
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
Виктор Гладких
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
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
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
Виктор Гладких
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
Anatoly
f7703f18b0 refactored upload image endpoint 2019-11-22 13:02:04 +03:00
Kuroshini
0fe3e3f8ba Fix 2019-11-22 10:17:34 +03:00
Kuroshini
e6b353e864 ES Facets in addition to results 2019-11-21 21:59:24 +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
Dmitriy Kuzmenko
15ddbd5a7e Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-20 16:29:57 +03:00
Dmitriy Kuzmenko
2e17d7265d add back api for collection 2019-11-20 16:29:46 +03:00
evgeniy-st
7f8f72815e append city or country to ProductDocumentSerialzier 2019-11-20 12:21:55 +03:00
Kuroshini
5c4c4c60c3 ES as separate server 2019-11-18 20:12:58 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Anatoly
8cf50ff2cd added endpoints for back office and refactored a little 2019-11-13 12:07:02 +03:00
d.kuzmenko
995d55302a Merge branch 'feature/nested-published-features' into 'develop'
Feature/nested published features

See merge request gm/gm-backend!112
2019-11-12 11:57:20 +00:00
Anatoly
46662398e4 refactored detail and list view of products 2019-11-11 19:19:18 +03:00
Kuroshini
c1f89515c5 Nested sitefeatures for new design 2019-11-07 18:08:29 +03:00
Anatoly
0aa0378ae0 intermediate commit 2019-11-06 15:35:47 +03:00
a.feteleu
d0165df987 fix translation 2019-11-03 20:31:50 +03:00
Anatoly
4f89d7603e change translation mechanics 2019-11-03 17:00:47 +03:00
Anatoly
c14ab722a1 change field parameter in model Guide (gm-241) 2019-11-03 00:25:03 +03:00
Anatoly
623934438f fixed svg path 2019-11-01 12:00:51 +03:00
evgeniy-st
30a58473c3 using a fallback language for translation 2019-10-31 16:11:46 +03:00
Dmitriy Kuzmenko
638bafe4a6 Merge remote-tracking branch 'origin/develop' into origin/migration_fix
# Conflicts:
#	apps/establishment/admin.py
#	project/settings/base.py
2019-10-30 19:12:59 +03:00
Anatoly
5675f23fae fixed BaseModelAdminMixin 2019-10-29 18:12:52 +03:00
Anatoly
03c75efece gm-259, gm-260, gm-261 2019-10-29 17:16:39 +03:00
Dmitriy Kuzmenko
e270131679 Merge branch 'develop' into origin/migration_fix 2019-10-29 15:27:40 +03:00