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 |
|
evgeniy-st
|
cfe1c982be
|
update docker-compose, requirements, base settings
|
2019-09-06 14:27:14 +03:00 |
|
Anatoly
|
605c81b33c
|
replace comment model from establishment app, added new app comment
|
2019-09-04 18:47:06 +03:00 |
|
Anatoly
|
cfc2d512ed
|
added corsheaders to INSTALLED_APPS
|
2019-09-04 15:15:28 +03:00 |
|
Anatoly
|
892159ccb6
|
Merge remote-tracking branch 'origin/develop' into feature/authorization
|
2019-09-02 13:52:53 +03:00 |
|
Anatoly
|
6d3b7b1921
|
fixed reset password view
|
2019-09-02 13:02:11 +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
|
e28435aba2
|
added preview image in establishment serializer
|
2019-09-01 18:11:09 +03:00 |
|
Anatoly
|
de8db655ed
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 13:38:40 +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 |
|
Dmitriy Kuzmenko
|
fc4facbf83
|
add contacts for establishments
|
2019-09-01 12:35:09 +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
|
693577a524
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
|
2019-08-30 12:03:19 +03:00 |
|
Anatoly
|
f0743fe688
|
Merge remote-tracking branch 'origin/develop' into feature/authorization
|
2019-08-30 11:59:13 +03:00 |
|
Anatoly
|
6f322907fe
|
rename advertisement urlpath
|
2019-08-30 11:56:29 +03:00 |
|
Anatoly
|
62ee83b1d4
|
refactored authorization
|
2019-08-30 11:53:19 +03:00 |
|
Anatoly
|
b7c1d6a48d
|
added application review
|
2019-08-30 10:48:44 +03:00 |
|
Anatoly
|
3aa1e92046
|
added table EstablishmentSchedule, added application timetable, added table Timetable
|
2019-08-29 17:59:09 +03:00 |
|
Anatoly
|
c9fdf9074e
|
small fix
|
2019-08-29 11:53:59 +03:00 |
|
Anatoly
|
57066048d6
|
added 95.213.204.126 to development allowed hosts
|
2019-08-29 11:41:14 +03:00 |
|
Anatoly
|
1213b39e0d
|
Merge branch 'feature/authorization' into develop
|
2019-08-29 11:40:24 +03:00 |
|
Anatoly
|
39e833ec1d
|
added custom JWT authentication
|
2019-08-29 09:43:31 +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
|
0db7b52df7
|
refactored remember flag in login
|
2019-08-28 12:54:17 +03:00 |
|
Dmitriy Kuzmenko
|
253da87a99
|
URL refactoring
|
2019-08-28 11:35:38 +03:00 |
|
evgeniy-st
|
f65b1caf9a
|
Fix redirect settings
|
2019-08-28 09:49:50 +03:00 |
|
Anatoly
|
a35fbc4456
|
added endpoint to upload an images
|
2019-08-27 19:03:52 +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 |
|
evgeniy-st
|
f82784cd19
|
update establishment-list endpoint
|
2019-08-27 12:33:16 +03:00 |
|
evgeniy-st
|
21985eb8bc
|
Merge branch 'develop' into feature/establishment
|
2019-08-26 18:26:05 +03:00 |
|
evgeniy-st
|
0135b25635
|
update urls conf
|
2019-08-26 18:25:16 +03:00 |
|
evgeniy-st
|
5c5ae15836
|
update settings
|
2019-08-26 18:24:47 +03:00 |
|
evgeniy-st
|
bb284420c4
|
initial app
|
2019-08-26 18:07:01 +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
|
da52f38b7f
|
added migrations, added ListAPI view endpoint
|
2019-08-26 15:27:33 +03:00 |
|
Anatoly
|
6caea820da
|
added application advertisement
|
2019-08-26 12:40:26 +03:00 |
|
Anatoly
|
1de7a84d56
|
added new application partner, added new model Partner
|
2019-08-23 16:58:27 +03:00 |
|
Anatoly
|
1b051f72c0
|
added restriction for upload data
|
2019-08-23 13:33:47 +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
|
e839094e28
|
Site settings and determine user location over ip
|
2019-08-22 14:23:02 +03:00 |
|
evgeniy-st
|
94fe15af35
|
added geoip2
|
2019-08-22 13:59:00 +03:00 |
|
Anatoly
|
ecb6349696
|
added CRUD endpoints for collection app
|
2019-08-21 12:09:21 +03:00 |
|
Anatoly
|
d24c0cf407
|
added app collection, added new models
|
2019-08-21 09:58:45 +03:00 |
|
Anatoly
|
3f5d56fb7a
|
added to login endpoint parameter "remember" in request body
|
2019-08-20 17:44:46 +03:00 |
|
Anatoly
|
a51a686600
|
added parameter to development settings; added "email_confirmed" flag to user admin page
|
2019-08-20 16:06:40 +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
|
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 |
|
evgeniy-st
|
d87b9ca2d1
|
refactor urlpatterns
|
2019-08-19 16:56:28 +03:00 |
|
Anatoly
|
5564de5670
|
version 0.0.20: fixed translate annotator
|
2019-08-19 13:01:59 +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
|
033674c5b2
|
version 0.0.10: updated CORS config
|
2019-08-14 18:48:59 +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
|
cc04a50709
|
version 0.0.5.12: refactored authorization app (added JWT support)
|
2019-08-13 14:14:18 +03:00 |
|
Anatoly
|
0a35f06ff5
|
version 0.0.5.11: refactored and setup CORS
|
2019-08-12 15:06:38 +03:00 |
|
Anatoly
|
60ea46592f
|
version 0.0.5.9: change url to sign up with fb, add settings for django social auth
|
2019-08-12 09:49:49 +03:00 |
|
Anatoly
|
7c27757874
|
version 0.0.5.8: fixed method to reset password (until without confirmation), unfinished confirm method
|
2019-08-11 20:51:50 +03:00 |
|