Commit Graph

84 Commits

Author SHA1 Message Date
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
Anatoly
1848bafd64 added new model favorites 2019-09-06 17:55:17 +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