Виктор Гладких
|
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 |
|
littlewolf
|
cf226974c8
|
Merge branch 'develop' into feature/fix-country-region-city-transfer
# Conflicts:
# apps/collection/models.py
# apps/location/serializers/common.py
# apps/location/transfer_data.py
# apps/transfer/management/commands/transfer.py
# apps/transfer/serializers/location.py
# project/settings/base.py
|
2019-11-13 00:28:49 +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 |
|
littlewolf
|
0058a3bdd4
|
Add skip_signal to utils
|
2019-11-06 23:13:57 +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 |
|
Dmitriy Kuzmenko
|
8fd14f2f44
|
Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/migration_fix
|
2019-10-29 15:27:19 +03:00 |
|
Dmitriy Kuzmenko
|
97f75dfc05
|
add filter accounts for existing users
|
2019-10-29 14:32:51 +03:00 |
|
Anatoly
|
8cf2cebe85
|
added BaseModelAdminMixin
|
2019-10-29 14:01:27 +03:00 |
|
alex
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +03:00 |
|
Anatoly
|
d12df5c8e1
|
added WineAppellation model
|
2019-10-28 12:33:48 +03:00 |
|
alex
|
25a2edf17d
|
establishment fin
|
2019-10-27 16:23:30 +03:00 |
|
alex
|
16f06ce2f1
|
fix news slug
|
2019-10-26 22:02:38 +03:00 |
|
alex
|
490fae3c00
|
Merge branch 'origin/feature/migration' into origin/feature/migrate-etablishment
# Conflicts:
# apps/transfer/management/commands/transfer.py
|
2019-10-26 20:47:49 +03:00 |
|
Виктор Гладких
|
fb770f8e2a
|
Fix merge
|
2019-10-25 15:56:02 +03:00 |
|
Виктор Гладких
|
a38fed847a
|
Fix roles
|
2019-10-25 15:51:07 +03:00 |
|
Виктор Гладких
|
b7831b9739
|
Fix IsContentPageManager
|
2019-10-25 15:25:35 +03:00 |
|
Kuroshini
|
4eaa600fc1
|
Fix all tests
|
2019-10-25 14:13:54 +03:00 |
|
Виктор Гладких
|
7f4b46dbf8
|
Fix country admin
|
2019-10-25 12:42:01 +03:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|
Виктор Гладких
|
046d0c5fe6
|
Fix country and comment role
|
2019-10-25 10:59:31 +03:00 |
|
Виктор Гладких
|
c33ea42b8e
|
Merge branch 'develop' into feature/fix_role
|
2019-10-25 10:15:38 +03:00 |
|
Виктор Гладких
|
851ba7f9dd
|
Test edit
|
2019-10-25 10:14:50 +03:00 |
|
alex
|
cd294961e0
|
Merge remote-tracking branch 'origin/develop' into feature/migration
|
2019-10-25 10:00:25 +03:00 |
|
Dmitriy Kuzmenko
|
66ddfb455b
|
fix tests
|
2019-10-24 22:19:59 +03:00 |
|
evgeniy-st
|
2864576c0c
|
fix TimeZoneChoiceField
|
2019-10-24 17:09:08 +03:00 |
|
alex
|
287578eb9e
|
base models and funcs
|
2019-10-24 17:08:00 +03:00 |
|
evgeniy-st
|
128488b5ee
|
some bugfixes
|
2019-10-24 16:17:37 +03:00 |
|
alex
|
5826fb2475
|
mysql to docker-compose fix exception
|
2019-10-24 14:49:59 +03:00 |
|
alex
|
3ce7e186f7
|
migrate from legacy news
|
2019-10-24 14:01:38 +03:00 |
|
evgeniy-st
|
636bc43a35
|
remove playlist from news model
|
2019-10-24 12:38:44 +03:00 |
|
Anatoly
|
90e53d738d
|
Merge branch 'develop' into feature/gm-148
# Conflicts:
# apps/main/models.py
# apps/news/admin.py
# apps/news/models.py
# apps/news/serializers.py
# apps/news/views.py
# project/settings/base.py
# project/settings/production.py
# requirements/base.txt
|
2019-10-23 12:00:58 +03:00 |
|
Виктор Гладких
|
adbc22f1f6
|
Fix comment test
|
2019-10-21 16:03:19 +03:00 |
|
Виктор Гладких
|
264e7bcb2a
|
Fix conflict
|
2019-10-21 14:43:14 +03:00 |
|
Виктор Гладких
|
019c22a0c8
|
Fix test
|
2019-10-21 14:39:04 +03:00 |
|
evgeniy-st
|
21e3f76f5a
|
Backoffice Tag&TagCategory
|
2019-10-18 18:02:24 +03:00 |
|
Виктор Гладких
|
c44f8c39c1
|
Fix tests news
|
2019-10-18 13:05:42 +03:00 |
|
Виктор Гладких
|
2e2ed19118
|
Fix establishment tests
|
2019-10-18 12:14:10 +03:00 |
|
Виктор Гладких
|
c012f969af
|
Add RestaurantReviewer role
|
2019-10-17 16:17:17 +03:00 |
|
Виктор Гладких
|
c80b53a0fc
|
reviewer manager
|
2019-10-17 15:04:08 +03:00 |
|
Виктор Гладких
|
766fdcdad5
|
Add reviewer manager
|
2019-10-16 15:18:31 +03:00 |
|
Виктор Гладких
|
9fd89bf812
|
Add establishment manager role
|
2019-10-16 11:40:51 +03:00 |
|
Виктор Гладких
|
3271a6fed9
|
Establishment manager
|
2019-10-16 11:02:26 +03:00 |
|
Виктор Гладких
|
04a6bbea19
|
Add content page manager
|
2019-10-16 10:43:06 +03:00 |
|
Виктор Гладких
|
86692019d1
|
Add Country admin to views
|
2019-10-16 10:14:23 +03:00 |
|
Виктор Гладких
|
322cfcd89d
|
Fix test
|
2019-10-15 15:33:28 +03:00 |
|