littlewolf
|
f5c16fba9d
|
Tmp fix
|
2019-10-11 10:45:49 +03:00 |
|
littlewolf
|
22d2396c6b
|
Merge branch 'develop' into feature/migrate-city-objects
# Conflicts:
# docker-compose.yml
# project/settings/base.py
|
2019-10-09 07:54:15 +03:00 |
|
evgeniy-st
|
36922e1684
|
update settings
|
2019-10-04 14:04:08 +03:00 |
|
Виктор Гладких
|
38be14b5ba
|
Merge branch 'develop' into feature/news-rating
|
2019-10-03 11:39:24 +03:00 |
|
d.kuzmenko
|
750f141017
|
Merge branch 'feature/sending-news-email' into 'develop'
Feature/sending news email
See merge request gm/gm-backend!45
|
2019-10-02 14:17:29 +00:00 |
|
Anatoly
|
f693c36382
|
switched host email account, changed exception error
|
2019-10-02 17:16:19 +03:00 |
|
Виктор Гладких
|
753471544e
|
Add app Rating
|
2019-10-02 14:17:06 +03:00 |
|
littlewolf
|
9dcdb7575e
|
Switch application
Add application command
Update mixin
Add mixin to models
|
2019-10-02 11:41:14 +03:00 |
|
michail
|
c0149a0695
|
added country_code to news email template
|
2019-10-02 11:48:03 +05:00 |
|
michail
|
b96ed30a49
|
added news mail template and task without celery delay
|
2019-10-02 11:48:03 +05:00 |
|
Виктор Гладких
|
693d895aa4
|
Fix tests
|
2019-10-01 11:52:46 +03:00 |
|
littlewolf
|
e3d26b5dd1
|
Temp commit
|
2019-10-01 07:43:38 +03:00 |
|
littlewolf
|
277418bf72
|
Fix docker host
|
2019-09-30 13:56:12 +03:00 |
|
littlewolf
|
c03792d0e3
|
Add legacy database
Add requirements
|
2019-09-30 11:19:09 +03:00 |
|
Anatoly
|
c4d8b89a8d
|
gm-127: finished
|
2019-09-26 14:19:01 +03:00 |
|
Anatoly
|
0e0d6e318e
|
GM-127: finished
|
2019-09-26 14:12:49 +03:00 |
|
Anatoly
|
207e35feb1
|
GM-127: in progress
|
2019-09-25 19:39:37 +03:00 |
|
evgeniy-st
|
009533d764
|
Tags & disable elasticsearch indexing
|
2019-09-23 16:06:40 +03:00 |
|
evgeniy-st
|
dc4b63d8b2
|
Refactor news
|
2019-09-23 15:35:37 +03:00 |
|
Anatoly
|
5f3947601a
|
rename url path collection to collections, delete property in M2M field
|
2019-09-20 15:11:33 +03:00 |
|
evgeniy-st
|
cace6a7d3b
|
Recipe list&detail api-endpoints
|
2019-09-19 14:22:40 +03:00 |
|
evgeniy-st
|
4de2ca4ef1
|
Recipe app&model
|
2019-09-19 11:57:58 +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
|
784728d155
|
Facebook auth return user email; fixed URL in templates
|
2019-09-18 11:21:27 +03:00 |
|
Anatoly
|
69f1a5cf48
|
GM-73 added ordering
|
2019-09-17 17:16:21 +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 |
|
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 |
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
Anatoly
|
500e470b39
|
Added CORSMiddleware
|
2019-09-10 15:01:10 +03:00 |
|
Anatoly
|
0647c46292
|
GM-68: Реализовать метод возвращения списка избранного для пользователя
|
2019-09-10 12:00:32 +03:00 |
|
evgeniy-st
|
9fab4454a0
|
Establishment index
|
2019-09-09 15:39:31 +03:00 |
|
Anatoly
|
1848bafd64
|
added new model favorites
|
2019-09-06 17:55:17 +03:00 |
|
evgeniy-st
|
99011ba15a
|
Initial search indexes app
|
2019-09-06 14:52:52 +03:00 |
|