Commit Graph

326 Commits

Author SHA1 Message Date
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
Виктор Гладких
9acef83894 Add country admin 2019-10-15 15:23:42 +03:00
Виктор Гладких
ff7df815f4 Fix country_id 2019-10-15 15:20:44 +03:00
Виктор Гладких
e8d0045cec Merge branch 'develop' into feature/GM-176_standard_user 2019-10-15 15:17:15 +03:00
Anatoly
6f6717efdc Merge branch 'develop' into feature/gm-192
# Conflicts:
#	apps/account/views/common.py
#	project/urls/back.py
2019-10-15 11:47:14 +03:00
Виктор Гладких
43531d88dc Country id 2019-10-15 10:05:31 +03:00
Виктор Гладких
1bd3cc9170 1 2019-10-14 17:32:34 +03:00
Kuroshini
6fa0051c93 Revert "Password reset confirmation mechanics"
This reverts commit 71528d8
2019-10-14 15:53:40 +03:00
Виктор Гладких
0656e2ae32 Confirmed email for user standard 2019-10-14 15:48:31 +03:00
Виктор Гладких
b3eac3666b Standart user, guest. 2019-10-14 14:48:13 +03:00
evgeniy-st
0d7104eace Merge branch 'develop' into feature/gm-192 2019-10-11 16:44:54 +03:00
Kuroshini
71528d8a28 Password reset confirmation mechanics 2019-10-10 20:49:35 +03:00
Anatoly
69d02e7a07 fix auth 2019-10-09 10:05:19 +03:00
Anatoly
91790bbc39 refactored 2019-10-04 14:30:34 +03:00
Anatoly
b2f900d15d gm-148: refactored 2019-10-04 13:25:42 +03:00
Anatoly
4890e00b95 gm-148: refactored 2019-10-04 11:50:29 +03:00
Anatoly
4796fce784 Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/news/admin.py
2019-10-02 18:11:47 +03:00
Anatoly
f693c36382 switched host email account, changed exception error 2019-10-02 17:16:19 +03:00
Anatoly
b31e71d4ef Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/news/serializers.py
#	project/settings/local.py
2019-10-02 10:20:14 +03:00
Anatoly
d9635a8599 gm-148: refactored 2019-10-02 10:16:32 +03:00
evgeniy-st
051957c7cf Refactor JSON Validation 2019-10-01 13:03:59 +03:00
Anatoly
aeebdd02c6 Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/news/models.py
2019-09-30 15:43:45 +03:00
Kuroshini
4d113a6916 Fix all test 2019-09-27 22:06:46 +03:00
Kuroshini
ac8356c7d1 Fix some test && routes && add migration 2019-09-27 19:03:30 +03:00
Anatoly
7f79ce8945 gm-148: in progress 2019-09-27 17:48:27 +03:00
d.kuzmenko
8957a52fe7 Merge branch 'feature/collections-update-recomendations' into 'develop'
Feature/collections update recomendations

See merge request gm/gm-backend!36
2019-09-27 14:43:43 +00:00
littlewolf
7a0999a520 Add new filter 2019-09-27 17:12:12 +03:00
littlewolf
a0a6578ae8 Add new filter 2019-09-27 17:11:42 +03:00
littlewolf
b55a8ffda6 Add comments 2019-09-27 12:23:12 +03:00
littlewolf
910322273e Add annotate to filter 2019-09-27 12:01:11 +03:00
evgeniy-st
62fbded6de added todo 2019-09-27 11:41:13 +03:00
littlewolf
5793eaad32 Add queryset mixin
Switch view in urls/common
Add homepage view
Switch test
2019-09-26 20:17:50 +03:00
Anatoly
14ae75f088 gm-148: refactored news serializer 2019-09-26 18:38:57 +03:00
Kuroshini
ae00c30fac Fix test 2019-09-26 17:50:07 +03:00
Kuroshini
441c16281d format api elastic results 2019-09-26 17:23:55 +03:00
Anatoly
f1eec96ce8 Merge branch 'develop' into feature/gm-127
# Conflicts:
#	apps/establishment/models.py
#	apps/establishment/urls/common.py
2019-09-26 14:29:39 +03:00
Anatoly
0e0d6e318e GM-127: finished 2019-09-26 14:12:49 +03:00
Виктор Гладких
7c0e505798 commit changes 2019-09-26 11:48:05 +03:00
Виктор Гладких
40d9f2f2ed check 2019-09-26 11:45:26 +03:00
Виктор Гладких
86d754f4bb validate json translated field 2019-09-26 11:38:37 +03:00
Anatoly
207e35feb1 GM-127: in progress 2019-09-25 19:39:37 +03:00
littlewolf
617beb652f Add test to modified item 2019-09-25 11:12:17 +03:00
littlewolf
6bbbd1d6fe Switch decorator to validate 2019-09-25 11:11:12 +03:00
littlewolf
d006184b14 Fix update 2019-09-24 20:22:27 +03:00
littlewolf
a55695b120 Switch to decorator
Add update test
2019-09-24 20:12:09 +03:00
littlewolf
82d29d2795 Add signal 2019-09-24 15:17:08 +03:00
littlewolf
eebd66fa27 Add tests to created_by and modified_by 2019-09-24 13:35:05 +03:00
d.kuzmenko
fb93231650 Merge branch 'feature/translation-tests' into 'develop'
Add translation tests to model and API

See merge request gm/gm-backend!19
2019-09-24 06:52:32 +00:00
littlewolf
80701f27a9 Add translation tests to model and API 2019-09-23 18:02:25 +03:00
evgeniy-st
dc4b63d8b2 Refactor news 2019-09-23 15:35:37 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Semyon Yekhmenin
e2e7734bf2 Feature/advertisements update 2019-09-19 07:05:32 +00:00
Anatoly
61fc78eeb9 fixed cookie settings for stage server 2019-09-18 11:28:00 +03:00
evgeniy-st
e67d7767a1 Elasticsearch: establishment address. Filter by country_id, country_code 2019-09-17 17:33:07 +03:00
Anatoly
555aa9a4e1 GM-25: Получение главной зоны 2019-09-13 18:08:36 +03:00
Anatoly
075298f6ec refactored apps account, authorization, news, utils 2019-09-12 14:44:49 +03:00
Anatoly
2c41e532c8 fixed ChangePasswordView 2019-09-12 09:33:09 +03:00
Anatoly
f8c795cd03 added redirect for ConfirmEmail and ResetPassword 2019-09-11 18:53:02 +03:00
Anatoly
cf884ed906 fixed UserSerializer, PasswordResetSerializer 2019-09-11 12:07:30 +03:00
Anatoly
500e470b39 Added CORSMiddleware 2019-09-10 15:01:10 +03:00
Anatoly
808178d56c GM-70: Добавить пагинацию комментариев в карточке ресторанов 2019-09-09 13:12:48 +03:00
Anatoly
0f6786fb13 favorites refactoring 2019-09-09 10:25:34 +03:00
Anatoly
1848bafd64 added new model favorites 2019-09-06 17:55:17 +03:00
Anatoly
e1d6455e81 added field cropped_image to User model 2019-09-06 13:47:37 +03:00
Anatoly
5403f0d325 refactored: login, logout, refresh token, change email, confirm email, reset password endpoints 2019-09-04 12:42:23 +03:00
Anatoly
09cf0f1a06 (In progress) refactored logout and refresh token endpoints 2019-09-03 18:59:11 +03:00
Anatoly
06e563b77a refactored authorization app 2019-09-03 16:48:06 +03:00
Anatoly
b20fe5e6fb update setup cookie for tokens 2019-09-03 16:25:44 +03:00
Anatoly
892159ccb6 Merge remote-tracking branch 'origin/develop' into feature/authorization 2019-09-02 13:52:53 +03:00
evgeniy-st
a2ef5bbfd5 small refactor 2019-09-02 12:00:19 +03:00
Anatoly
3c7fc7a436 Merge remote-tracking branch 'origin/develop' into feature/authorization 2019-09-02 11:10:52 +03:00
Anatoly
e8d4626cdb Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
#	apps/establishment/models.py
2019-09-01 13:26:55 +03:00
Anatoly
c39b5dbf1d Merge branch 'develop' into feature/authorization 2019-08-30 17:57:13 +03:00
Anatoly
f8b87c4788 added endpoint to change an email 2019-08-30 17:56:35 +03:00
evgeniy-st
7d7fa5e347 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-08-30 15:42:12 +03:00
evgeniy-st
2a8ffb16de Notification app & subscription 2019-08-30 15:40:53 +03:00
Anatoly
8fccd069ec added additional fields to review model 2019-08-30 15:30:41 +03:00
Anatoly
62ee83b1d4 refactored authorization 2019-08-30 11:53:19 +03:00
Dmitriy Kuzmenko
e7c0490a4f Merge remote-tracking branch 'origin/develop' into develop 2019-08-29 14:52:08 +03:00
Dmitriy Kuzmenko
9a7052026b add metadata 2019-08-29 14:51:55 +03:00
Anatoly
1213b39e0d Merge branch 'feature/authorization' into develop 2019-08-29 11:40:24 +03:00
Anatoly
5598290456 refactored refresh-token endpoint 2019-08-29 11:40:00 +03:00
Anatoly
39e833ec1d added custom JWT authentication 2019-08-29 09:43:31 +03:00
Dmitriy Kuzmenko
b2a105198f fix translation 2019-08-28 18:11:56 +03:00
Dmitriy Kuzmenko
cb1ff8e410 add configuration 2019-08-28 17:53:52 +03:00
evgeniy-st
ba00bf1b00 Merge branch 'develop' into feature/establishment 2019-08-28 15:35:21 +03:00
evgeniy-st
1aef1a5bb1 Translation & establishment 2019-08-28 15:21:28 +03:00
Anatoly
de0a1d6358 changed jwt login view (changed status code if user not found) 2019-08-28 12:58:33 +03:00
Anatoly
0db7b52df7 refactored remember flag in login 2019-08-28 12:54:17 +03:00
Anatoly
2172972216 refactored gallery app 2019-08-27 18:58:40 +03:00
Anatoly
ce260a69aa Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"
This reverts commit 07333234
2019-08-27 18:18:58 +03:00
Anatoly
0733323486 added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections 2019-08-27 17:15:09 +03:00
Anatoly
5edcd0afe9 replace image field with svg_image field, added validator, and change serializer 2019-08-26 17:39:03 +03:00
Anatoly
d9f52891dc fixed auth exceptions 2019-08-26 10:53:22 +03:00
Dmitriy Kuzmenko
0dba806f04 fixed method _put_data_in_cookies 2019-08-23 09:47:30 +03:00
Dmitriy Kuzmenko
f86a94274d put cookies in request, refactored JWTViewMixin, change endpoint to get news list 2019-08-23 09:42:31 +03:00
evgeniy-st
9bdbf569a4 Merge branch 'feature/define-site' into develop 2019-08-22 14:24:26 +03:00
evgeniy-st
e839094e28 Site settings and determine user location over ip 2019-08-22 14:23:02 +03:00
Anatoly
414370ed73 fixed NewsList view 2019-08-22 12:14:18 +03:00
Anatoly
3f5d56fb7a added to login endpoint parameter "remember" in request body 2019-08-20 17:44:46 +03:00
Anatoly
047803bf43 added endpoint to account app; added "email_confirmed" field to User model; refactored auth app; 2019-08-20 15:43:59 +03:00
Anatoly
4289b01a19 Merge branch 'develop' into feature/authorization 2019-08-20 12:00:14 +03:00
Anatoly
6901978cf1 fixed cookies parameters for locale 2019-08-20 11:57:12 +03:00
Anatoly
556e9ea564 version 0.0.21: added endpoints to reset password, added endpoint to finish signing up, move some tasks to celery, added templates 2019-08-20 11:10:07 +03:00
Anatoly
5564de5670 version 0.0.20: fixed translate annotator 2019-08-19 13:01:59 +03:00
Anatoly
394d82342c version 0.0.17: added annotator for translation JSONFields, and refactored JWTView a little bit 2019-08-15 18:33:36 +03:00
Anatoly
c7d7f99c68 version 0.0.16: fixed cookies 2019-08-15 17:59:13 +03:00
Anatoly
dbe2286c0c version 0.0.14: change JWTGeneric view attributes 2019-08-15 16:30:22 +03:00
Anatoly
a848f15399 version 0.0.14: change JWTGeneric view attributes 2019-08-15 14:32:38 +03:00
Anatoly
2fc2b7daed version 0.0.13: bug fix 2019-08-15 14:23:09 +03:00
Anatoly
663c003119 version 0.0.12: updated JWT views 2019-08-15 14:05:17 +03:00
Anatoly
d5a14ef8c2 version 0.0.11: added new model and CRUD endpoints to them; refactored auth app 2019-08-15 11:59:10 +03:00
Anatoly
7fe903b01b version 0.0.8: added CRUD endpoints for models Address, Region, Country and City; also refactored custom permission class 2019-08-14 14:00:12 +03:00
Anatoly
e830e30c90 version 0.0.7: new model, added endpoint ot logout, refactored auth views and serializers 2019-08-14 11:27:48 +03:00
Dmitriy Kuzmenko
68f6e0bc9c version 0.0.6 new models and api for News 2019-08-13 15:23:00 +03:00
Anatoly
c9c5534cf0 version 0.0.5.10: added endpoint to refresh token 2019-08-12 12:55:08 +03:00
Anatoly
cfc6e05595 version 0.0.5.7: added method to reset password (until without confirmation) 2019-08-11 19:53:36 +03:00
Anatoly
cb3fbcac93 version 0.0.5.4: added endpoints to login with username or email, refactored auth serializers, added project exceptions, refactored base settings 2019-08-09 22:10:13 +03:00
Anatoly
d0c362c88d version 0.0.5.2: added method to revoke an access or refresh token 2019-08-09 10:43:29 +03:00
Anatoly
22f2de94f2 version 0.0.5.1: added integration with facebook, refactored a lot 2019-08-09 09:56:16 +03:00
Dmitriy Kuzmenko
fc2a689b6d version 0.0.1: add project, model user and api 2019-08-07 16:10:23 +03:00