Commit Graph

3231 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
fc4facbf83 add contacts for establishments 2019-09-01 12:35:09 +03:00
Anatoly
0d4f080850 added new model - Comment 2019-09-01 12:30:00 +03:00
Anatoly
ba317f77b8 finish review model 2019-09-01 11:50:52 +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
805bda3267 Extend establishment filterset 2019-08-30 17:25:07 +03:00
evgeniy-st
9e1bf5ba0e update news endpoint 2019-08-30 16:08:01 +03:00
evgeniy-st
9373137a29 remove throttling 2019-08-30 15:43:15 +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
8fccd069ec added additional fields to review model 2019-08-30 15:30:41 +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
46faf6ecee Merge remote-tracking branch 'origin/develop' into feature/establishment
# Conflicts:
#	apps/establishment/admin.py
#	apps/establishment/serializers.py
2019-08-29 18:19:57 +03:00
Anatoly
3aa1e92046 added table EstablishmentSchedule, added application timetable, added table Timetable 2019-08-29 17:59:09 +03:00
evgeniy-st
62da2ee114 api establishment-detail 2019-08-29 17:26:22 +03:00
Dmitriy Kuzmenko
2a16198a8b add award filter 2019-08-29 15:00:30 +03:00
Dmitriy Kuzmenko
e7c0490a4f Merge remote-tracking branch 'origin/develop' into develop 2019-08-29 14:52:08 +03:00
Dmitriy Kuzmenko
9a7052026b add metadata 2019-08-29 14:51:55 +03:00
Anatoly
8a234b6d8f added query search by title in news list endpoint 2019-08-29 12:52:46 +03:00
Anatoly
c9fdf9074e small fix 2019-08-29 11:53:59 +03:00
Anatoly
79edd6c51d fixed collection list and news list endpoints 2019-08-29 11:42:52 +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
5598290456 refactored refresh-token endpoint 2019-08-29 11:40:00 +03:00
Anatoly
39e833ec1d added custom JWT authentication 2019-08-29 09:43:31 +03:00
evgeniy-st
e3ad562680 update news model 2019-08-28 18:30:35 +03:00
Dmitriy Kuzmenko
967c08864d Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-08-28 18:12:09 +03:00
Dmitriy Kuzmenko
b2a105198f fix translation 2019-08-28 18:11:56 +03:00
evgeniy-st
d9793b2056 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-08-28 18:03:09 +03:00
Dmitriy Kuzmenko
4a8053b231 Merge remote-tracking branch 'origin/develop' into develop 2019-08-28 17:54:12 +03:00
Dmitriy Kuzmenko
cb1ff8e410 add configuration 2019-08-28 17:53:52 +03:00
Anatoly
7a1d5e269c refactored ImageSerializer 2019-08-28 17:25:16 +03:00
Anatoly
dbb0cbc05e refactored endpoint to upload an image 2019-08-28 17:18:52 +03:00
evgeniy-st
c09b495bfd update Establishment serializer 2019-08-28 16:31:02 +03:00
evgeniy-st
e5989273dc Establishment add pagination 2019-08-28 15:41:17 +03:00
evgeniy-st
0f748ec714 Merge branch 'feature/establishment' into develop 2019-08-28 15:35:41 +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
4c448efc96 added field image_url to news list and collection list 2019-08-28 13:41:33 +03:00
Anatoly
6d95349a52 refactored logout endpoint 2019-08-28 13:14:57 +03:00
Anatoly
de0a1d6358 changed jwt login view (changed status code if user not found) 2019-08-28 12:58:33 +03:00
Anatoly
0db7b52df7 refactored remember flag in login 2019-08-28 12:54:17 +03:00
Anatoly
e22a54114b refactored collection app 2019-08-28 12:22:13 +03:00
Anatoly
0f6147c1dc Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/collection/urls/common.py
2019-08-28 11:50:15 +03:00
Dmitriy Kuzmenko
253da87a99 URL refactoring 2019-08-28 11:35:38 +03:00
Dmitriy Kuzmenko
3d7727b4b4 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-08-28 10:15:29 +03:00