Anatoly
|
75e4077917
|
refactored structure of XML-document
|
2020-01-10 13:06:17 +03:00 |
|
Anatoly
|
963e0597dc
|
set username as non-required field on registration stage
(https://dev-krd.atlassian.net/browse/GM-304)
|
2020-01-09 17:57:10 +03:00 |
|
Anatoly
|
b457ffe975
|
small changes
|
2020-01-09 14:59:29 +03:00 |
|
Anatoly
|
d3c723eb43
|
intermediate commit
|
2019-12-30 19:07:06 +03:00 |
|
Anatoly
|
1468e5cdde
|
intermediate commit
|
2019-12-30 18:15:55 +03:00 |
|
Anatoly
|
2827374911
|
intermediate commit
|
2019-12-30 13:22:57 +03:00 |
|
Dmitriy Kuzmenko
|
e2d71fca8f
|
Merge branch 'develop' into feature/guides
|
2019-12-27 18:00:20 +03:00 |
|
Dmitriy Kuzmenko
|
ccd9f717df
|
Merge remote-tracking branch 'origin/feature/guides' into feature/guides
# Conflicts:
# apps/utils/export.py
|
2019-12-27 17:59:20 +03:00 |
|
Dmitriy Kuzmenko
|
d09776c8fa
|
add xml
|
2019-12-27 17:57:16 +03:00 |
|
Anatoly
|
151c017561
|
see changes
|
2019-12-27 17:49:56 +03:00 |
|
Anatoly
|
f42f571053
|
see changes
|
2019-12-27 15:59:15 +03:00 |
|
Anatoly
|
b41c185a65
|
see changes
|
2019-12-27 14:46:36 +03:00 |
|
alex
|
b958e0b597
|
preview_image fix
|
2019-12-27 11:16:38 +03:00 |
|
alex
|
e3d7618c62
|
preview_image to establishment and product type and subtype
|
2019-12-27 09:47:48 +03:00 |
|
Dmitriy Kuzmenko
|
02d0112d8b
|
add export for guides
|
2019-12-26 18:11:48 +03:00 |
|
Anatoly
|
d9df886b98
|
added guide type field, added tasks, refactored GuideElement model, added endpoint,
|
2019-12-25 22:14:35 +03:00 |
|
Anatoly
|
65746b1cd0
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/models.py
|
2019-12-24 12:33:39 +03:00 |
|
Anatoly
|
858b6f3544
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/serializers/news.py
# apps/utils/models.py
|
2019-12-24 12:10:16 +03:00 |
|
d.kuzmenko
|
6a68042178
|
Merge branch 'feature/permission_liquor' into 'develop'
Feature/permission liquor
See merge request gm/gm-backend!175
|
2019-12-23 13:40:13 +00:00 |
|
alex
|
1c04703c77
|
fix test and news type
|
2019-12-23 15:39:54 +03:00 |
|
Anatoly
|
f576825a71
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/models.py
# apps/establishment/models.py
# apps/establishment/views/web.py
# apps/product/views/common.py
# requirements/base.txt
|
2019-12-23 13:11:05 +03:00 |
|
Anatoly
|
7452f0bef0
|
intermediate commit
|
2019-12-23 12:38:13 +03:00 |
|
Anatoly
|
a6bcbdddc1
|
fix es image url
|
2019-12-23 09:44:29 +03:00 |
|
Anatoly
|
cc7125b468
|
added image url to es
|
2019-12-23 09:19:16 +03:00 |
|
Dmitriy Kuzmenko
|
f565e188f1
|
Merge branch 'panels' into develop
|
2019-12-22 20:34:29 +03:00 |
|
Dmitriy Kuzmenko
|
f010c97433
|
add export for panel
|
2019-12-22 20:33:51 +03:00 |
|
Kuroshini
|
660c8e791b
|
tags translation
|
2019-12-20 19:08:53 +03:00 |
|
Kuroshini
|
d1699e001e
|
tag models translations in interface dictionary
|
2019-12-20 18:01:52 +03:00 |
|
littlewolf
|
3dd76503a5
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/transfer/management/commands/transfer.py
|
2019-12-20 11:55:23 +03:00 |
|
Dmitriy Kuzmenko
|
847412bb2f
|
Merge branch 'develop' into panels
# Conflicts:
# apps/main/admin.py
|
2019-12-19 19:09:49 +03:00 |
|
Dmitriy Kuzmenko
|
a1f06fd0b9
|
panels executor
|
2019-12-19 19:07:23 +03:00 |
|
Виктор Гладких
|
eaefae399d
|
Fix est_type.id
|
2019-12-17 17:52:54 +03:00 |
|
Виктор Гладких
|
1d8b707c3c
|
Fix est_type.id
|
2019-12-17 17:51:56 +03:00 |
|
Kuroshini
|
22aefc2f83
|
description is_active logic
|
2019-12-17 17:34:20 +03:00 |
|
Kuroshini
|
900846951e
|
localized description
|
2019-12-17 16:09:03 +03:00 |
|
Kuroshini
|
2863a338e1
|
translated fields work out
|
2019-12-17 16:09:03 +03:00 |
|
Anatoly
|
471239983e
|
Merge branch 'develop' into feature/guides
# Conflicts:
# apps/collection/views/back.py
# apps/transfer/models.py
|
2019-12-17 14:47:26 +03:00 |
|
Виктор Гладких
|
458370d4c9
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-17 14:24:15 +03:00 |
|
Anatoly
|
dbbb526902
|
Refactored mechanism to find similar objects. Added endpoints to product app.
|
2019-12-17 13:02:46 +03:00 |
|
Anatoly
|
956aae281f
|
refactored fix duplicates
|
2019-12-16 13:46:52 +03:00 |
|
Anatoly
|
86257153ac
|
refactored guide ad label photos
|
2019-12-13 12:21:31 +03:00 |
|
littlewolf
|
6ef0e7adfe
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-13 09:18:44 +03:00 |
|
Dmitriy Kuzmenko
|
b03cd4fe09
|
add transfer command, models and crud api.
|
2019-12-12 15:37:42 +03:00 |
|
Anatoly
|
1b7c83899a
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-11 15:01:17 +03:00 |
|
Виктор Гладких
|
b48cd4a81c
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-11 09:28:25 +03:00 |
|
Kuroshini
|
043fcb262b
|
fix test #2
|
2019-12-10 23:30:07 +03:00 |
|
Kuroshini
|
ecef1a217a
|
fix some test
|
2019-12-10 22:10:37 +03:00 |
|
Kuroshini
|
4010c9fede
|
News multilang slugs (model && views)
|
2019-12-10 19:16:19 +03:00 |
|
Виктор Гладких
|
c32d3e4827
|
permission
|
2019-12-10 18:54:49 +03:00 |
|
Виктор Гладких
|
0a8db7e3ad
|
permission
|
2019-12-10 18:36:18 +03:00 |
|
Виктор Гладких
|
d441e69b81
|
Merge branch 'develop' into feature/permission_liquor
|
2019-12-10 12:51:30 +03:00 |
|
Виктор Гладких
|
0132a03852
|
Develop rules
|
2019-12-10 12:49:59 +03:00 |
|
Виктор Гладких
|
6b8fdf7eed
|
Add migrate for product models
|
2019-12-10 10:45:35 +03:00 |
|
Kuroshini
|
a2395b807e
|
User locale & city reading
|
2019-12-09 20:42:47 +03:00 |
|
littlewolf
|
c480089f30
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# _dockerfiles/db/Dockerfile
# apps/transfer/management/commands/transfer.py
# docker-compose.mysql.yml
# project/settings/local.py
|
2019-12-09 10:41:01 +03:00 |
|
Виктор Гладких
|
bd567200c8
|
Merge branch 'develop' into feature/permission_winery
|
2019-12-09 09:40:33 +03:00 |
|
Виктор Гладких
|
5cac9659e5
|
Clean code
|
2019-12-09 09:38:58 +03:00 |
|
Виктор Гладких
|
af7aef6d23
|
Add winery reviewer
|
2019-12-09 09:38:18 +03:00 |
|
Kuroshini
|
b5a113c875
|
user last visit middleware
|
2019-12-06 18:53:40 +03:00 |
|
Виктор Гладких
|
8e63b969bf
|
Merge branch 'develop' into feature/permission_winery
|
2019-12-06 16:58:44 +03:00 |
|
Виктор Гладких
|
e824b5ee65
|
winery permission
|
2019-12-06 16:51:57 +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 |
|
littlewolf
|
4c273a00be
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
|
2019-12-02 15:29:14 +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 |
|
littlewolf
|
470bd096b0
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/location/models.py
# apps/location/transfer_data.py
# apps/location/views/common.py
# apps/transfer/management/commands/transfer.py
# project/settings/local.py
|
2019-11-21 14:43:30 +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 |
|
littlewolf
|
cf7cc9bd0c
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/transfer/management/commands/transfer.py
# apps/transfer/serializers/location.py
|
2019-11-15 17:08:51 +03:00 |
|
Anatoly
|
8cf50ff2cd
|
added endpoints for back office and refactored a little
|
2019-11-13 12:07:02 +03:00 |
|