Commit Graph

71 Commits

Author SHA1 Message Date
Anatoly
d9635a8599 gm-148: refactored 2019-10-02 10:16:32 +03:00
Anatoly
7f79ce8945 gm-148: in progress 2019-09-27 17:48:27 +03:00
Anatoly
14ae75f088 gm-148: refactored news serializer 2019-09-26 18:38:57 +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
4de2ca4ef1 Recipe app&model 2019-09-19 11:57:58 +03:00
Anatoly
784728d155 Facebook auth return user email; fixed URL in templates 2019-09-18 11:21:27 +03:00
Anatoly
e572ff6445 increase cookies max-age 2019-09-16 15:50:45 +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
Anatoly
075298f6ec refactored apps account, authorization, news, utils 2019-09-12 14:44:49 +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
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
1848bafd64 added new model favorites 2019-09-06 17:55:17 +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
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
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
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
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
21985eb8bc Merge branch 'develop' into feature/establishment 2019-08-26 18:26:05 +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
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