Commit Graph

201 Commits

Author SHA1 Message Date
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
evgeniy-st
94fe15af35 added geoip2 2019-08-22 13:59:00 +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
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
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
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
cfc6e05595 version 0.0.5.7: added method to reset password (until without confirmation) 2019-08-11 19:53:36 +03:00
Anatoly
4fbee551c3 version 0.0.5.6: added method to sign up 2019-08-10 19:18:55 +03:00
Anatoly
cb3fbcac93 version 0.0.5.4: added endpoints to login with username or email, refactored auth serializers, added project exceptions, refactored base settings 2019-08-09 22:10:13 +03:00
Anatoly
22f2de94f2 version 0.0.5.1: added integration with facebook, refactored a lot 2019-08-09 09:56:16 +03:00
Dmitriy Kuzmenko
c5df0faa16 version 0.0.4: add app locations with models City, Regions, Address, Countries 2019-08-08 17:06:07 +03:00
Anatoly
a253ce0442 version 0.0.3: remove package modeltranslate, update settings, update requirements 2019-08-08 16:40:26 +03:00
Anatoly
76c6aef09c version 0.0.2: updated requirements list, updated settings, expanded the list of supported languages 2019-08-07 17:26:13 +03:00
Dmitriy Kuzmenko
fc2a689b6d version 0.0.1: add project, model user and api 2019-08-07 16:10:23 +03:00