Anatoly
|
af0c134957
|
Fixed docs
|
2019-09-18 12:16:32 +03:00 |
|
Anatoly
|
4a3e028c3a
|
Fixed reset password
|
2019-09-18 11:50:39 +03:00 |
|
evgeniy-st
|
51d0ae0d60
|
Merge branch 'develop' into feature/elasticsearch-establishment-tags
|
2019-09-18 11:47:55 +03:00 |
|
evgeniy-st
|
39b2fc49b5
|
ES Establishment tags. indexing & search
|
2019-09-18 11:46:53 +03:00 |
|
Dmitriy Kuzmenko
|
20fe40010c
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-18 11:41:43 +03:00 |
|
Dmitriy Kuzmenko
|
e9bf129f82
|
add api locations for back office
|
2019-09-18 11:39:46 +03:00 |
|
Anatoly
|
61fc78eeb9
|
fixed cookie settings for stage server
|
2019-09-18 11:28:00 +03:00 |
|
Anatoly
|
784728d155
|
Facebook auth return user email; fixed URL in templates
|
2019-09-18 11:21:27 +03:00 |
|
evgeniy-st
|
2908286e6c
|
price_level & toque_number settings
|
2019-09-18 10:50:00 +03:00 |
|
evgeniy-st
|
6e4e1b214d
|
Merge branch 'develop' into feature/elasticsearch-establishment-address
|
2019-09-17 17:34:22 +03:00 |
|
evgeniy-st
|
e67d7767a1
|
Elasticsearch: establishment address. Filter by country_id, country_code
|
2019-09-17 17:33:07 +03:00 |
|
Dmitriy Kuzmenko
|
ccc1660e1f
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-17 17:16:48 +03:00 |
|
Dmitriy Kuzmenko
|
c3717ecfd9
|
merge transportation
|
2019-09-17 17:16:35 +03:00 |
|
Anatoly
|
69f1a5cf48
|
GM-73 added ordering
|
2019-09-17 17:16:21 +03:00 |
|
Dmitriy Kuzmenko
|
6d873d66a2
|
Merge remote-tracking branch 'origin/feature/establishment_transportation_field' into develop
# Conflicts:
# apps/establishment/models.py
|
2019-09-17 17:07:29 +03:00 |
|
Anatoly
|
75f75ba3fd
|
Merge branch 'develop' into feature/gm-73
|
2019-09-17 15:37:07 +03:00 |
|
Anatoly
|
27a1998dbc
|
GM-73: Логика похожих ресторанов
|
2019-09-17 15:36:33 +03:00 |
|
Kuroshini
|
4ee6306efb
|
Add transportation text field to establishment model
|
2019-09-17 13:47:41 +03:00 |
|
evgeniy-st
|
2abf2c7ffe
|
fix import
|
2019-09-17 11:02:32 +03:00 |
|
evgeniy-st
|
8ac46b7379
|
sentry settings for dev-server
|
2019-09-17 10:42:05 +03:00 |
|
evgeniy-st
|
7a021a1435
|
update establishment search view
|
2019-09-16 17:56:51 +03:00 |
|
Dmitriy Kuzmenko
|
a190f2ca88
|
fix settings for stage server
|
2019-09-16 17:27:42 +03:00 |
|
Anatoly
|
e572ff6445
|
increase cookies max-age
|
2019-09-16 15:50:45 +03:00 |
|
evgeniy-st
|
db5ff7afcd
|
update settings, update establishment document
|
2019-09-16 11:21:14 +03:00 |
|
evgeniy-st
|
8e864d32b9
|
Merge branch 'develop' into feature/elasticsearch
|
2019-09-16 10:58:09 +03:00 |
|
evgeniy-st
|
adbf5d57c5
|
update docker-compose file
|
2019-09-16 10:46:34 +03:00 |
|
Anatoly
|
0043b1a8c1
|
Merge branch 'feature/gm-25' into develop
|
2019-09-16 09:38:52 +03:00 |
|
Anatoly
|
306cb76e1c
|
GM-25: Added comments
|
2019-09-16 09:35:20 +03:00 |
|
Anatoly
|
555aa9a4e1
|
GM-25: Получение главной зоны
|
2019-09-13 18:08:36 +03:00 |
|
Anatoly
|
30875958ea
|
increase access token lifetime to 30 days and unregister unused models in admin page
|
2019-09-13 12:37:03 +03:00 |
|
Dmitriy Kuzmenko
|
15f02b72ca
|
add email and phone api for establishments
|
2019-09-13 12:20:36 +03:00 |
|
Dmitriy Kuzmenko
|
10d9b52bec
|
Merge remote-tracking branch 'origin/develop' into feature/backoffice
|
2019-09-12 18:27:04 +03:00 |
|
Dmitriy Kuzmenko
|
efac785248
|
add api for estab, social, plates, menu
|
2019-09-12 18:24:21 +03:00 |
|
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 |
|