Commit Graph

277 Commits

Author SHA1 Message Date
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