Anatoly
|
1e650b9b1f
|
replace ImageFields to URLFields in User model, refactored serializers that included this fields
|
2019-09-12 18:10:52 +03:00 |
|
Anatoly
|
e4eedd8af2
|
Merge remote-tracking branch 'origin/feature/nearest_restaurants' into develop
# Conflicts:
# apps/establishment/views.py
|
2019-09-12 17:36:52 +03:00 |
|
Anatoly
|
f45ac7e7fe
|
fixed establishment detail
|
2019-09-12 17:33:55 +03:00 |
|
Anatoly
|
c768228bc9
|
Merge branch 'feature/gm-26' into develop
|
2019-09-12 16:18:57 +03:00 |
|
Anatoly
|
1ee21edb8e
|
added endpoint to retrieve establishment tags
|
2019-09-12 16:18:42 +03:00 |
|
Anatoly
|
075298f6ec
|
refactored apps account, authorization, news, utils
|
2019-09-12 14:44:49 +03:00 |
|
Semyon
|
bdc2c327f6
|
Registered path for nearest establishments
|
2019-09-12 14:25:03 +03:00 |
|
Semyon
|
5943839eda
|
Added view for nearest establishments
|
2019-09-12 14:24:48 +03:00 |
|
Anatoly
|
ec2e87fe1a
|
fixed settings for COOKIES, related to unable to login in admin page (CSRF ERROR)
|
2019-09-12 10:20:11 +03:00 |
|
Anatoly
|
a0ca5ab964
|
Merge branch 'feature/redirect' into develop
# Conflicts:
# apps/account/views/common.py
# project/templates/account/password_reset_email.html
# project/templates/authorization/confirm_email.html
|
2019-09-12 09:34:06 +03:00 |
|
Anatoly
|
2c41e532c8
|
fixed ChangePasswordView
|
2019-09-12 09:33:09 +03:00 |
|
Anatoly
|
06c7d790bb
|
added redirect for ConfirmEmail and ResetPassword
|
2019-09-11 18:55:25 +03:00 |
|
Anatoly
|
f8c795cd03
|
added redirect for ConfirmEmail and ResetPassword
|
2019-09-11 18:53:02 +03:00 |
|
Kuroshini
|
2622395006
|
add local docker conf override to gitignore
|
2019-09-11 17:06:01 +03:00 |
|
Anatoly
|
cf884ed906
|
fixed UserSerializer, PasswordResetSerializer
|
2019-09-11 12:07:30 +03:00 |
|
Anatoly
|
434df203da
|
fixed account detail
|
2019-09-10 18:03:01 +03:00 |
|
Anatoly
|
530ce38527
|
fixed account detail
|
2019-09-10 17:53:50 +03:00 |
|
Anatoly
|
2d102f0005
|
added cookie settings for local and development
|
2019-09-10 17:16:03 +03:00 |
|
Anatoly
|
b5707c6b26
|
Revert "added cookie settings for local and development"
This reverts commit 8e506bd5
|
2019-09-10 17:12:56 +03:00 |
|
Anatoly
|
8e506bd5e1
|
added cookie settings for local and development
|
2019-09-10 17:05:41 +03:00 |
|
Anatoly
|
7e468c539a
|
change project settings
|
2019-09-10 15:35:24 +03:00 |
|
a.feteleu
|
cf1c10d6ec
|
Revert "small refactoring favorites"
This reverts commit a4d7430379
|
2019-09-10 12:19:00 +00:00 |
|
Anatoly
|
c04d7b1bd3
|
remove unused dependencies
|
2019-09-10 15:01:45 +03:00 |
|
Anatoly
|
500e470b39
|
Added CORSMiddleware
|
2019-09-10 15:01:10 +03:00 |
|
evgeniy-st
|
c58d3bae36
|
Tags indexing and search (by id)
|
2019-09-10 12:58:39 +03:00 |
|
Anatoly
|
a4d7430379
|
small refactoring favorites
|
2019-09-10 12:19:21 +03:00 |
|
Anatoly
|
0647c46292
|
GM-68: Реализовать метод возвращения списка избранного для пользователя
|
2019-09-10 12:00:32 +03:00 |
|
Anatoly
|
96ecdc69ca
|
fixed UserSerializer
|
2019-09-10 09:45:48 +03:00 |
|
Anatoly
|
40605ff123
|
change flag is_active after authorization
|
2019-09-09 18:00:17 +03:00 |
|
Anatoly
|
89830ffdac
|
small fix
|
2019-09-09 17:12:03 +03:00 |
|
Anatoly
|
64b101516d
|
GM-81: Доарботать механизм авторизации при невалидированном email и изменении email
|
2019-09-09 15:45:51 +03:00 |
|
evgeniy-st
|
9fab4454a0
|
Establishment index
|
2019-09-09 15:39:31 +03:00 |
|
evgeniy-st
|
87efc50d94
|
translated field into serializer
|
2019-09-09 14:55:44 +03:00 |
|
Anatoly
|
efe1539dad
|
Refactored ImageSerializer
|
2019-09-09 13:14:43 +03:00 |
|
Anatoly
|
808178d56c
|
GM-70: Добавить пагинацию комментариев в карточке ресторанов
|
2019-09-09 13:12:48 +03:00 |
|
evgeniy-st
|
b326d7b8fd
|
Overrided searchfilterbackend
|
2019-09-09 12:00:53 +03:00 |
|
Anatoly
|
273f74f911
|
added flag in_favorites in establishment
|
2019-09-09 11:37:57 +03:00 |
|
Anatoly
|
2f5240adfa
|
GM-67: Внедрить передачу флага нахождения заведения в избранном пользователя
|
2019-09-09 11:36:17 +03:00 |
|
Anatoly
|
7577ad330c
|
union favorites create/destroy in one endpoint
|
2019-09-09 10:47:38 +03:00 |
|
Anatoly
|
0f6786fb13
|
favorites refactoring
|
2019-09-09 10:25:34 +03:00 |
|
Anatoly
|
e6144d8f33
|
small fix
|
2019-09-09 09:25:38 +03:00 |
|
Anatoly
|
1848bafd64
|
added new model favorites
|
2019-09-06 17:55:17 +03:00 |
|
evgeniy-st
|
43804ae5ab
|
some fixes
|
2019-09-06 17:34:21 +03:00 |
|
evgeniy-st
|
b6a3aa4264
|
update subscriber serializer
|
2019-09-06 14:54:11 +03:00 |
|
evgeniy-st
|
99011ba15a
|
Initial search indexes app
|
2019-09-06 14:52:52 +03:00 |
|
evgeniy-st
|
cfe1c982be
|
update docker-compose, requirements, base settings
|
2019-09-06 14:27:14 +03:00 |
|
Anatoly
|
e1d6455e81
|
added field cropped_image to User model
|
2019-09-06 13:47:37 +03:00 |
|
Anatoly
|
5449891394
|
added validation to UserSerializer
|
2019-09-06 11:55:56 +03:00 |
|
Anatoly
|
20921719d3
|
refactored account
|
2019-09-06 11:45:30 +03:00 |
|
Anatoly
|
742d700d3c
|
refactored comments
|
2019-09-06 11:06:02 +03:00 |
|