Dmitriy Kuzmenko
|
082a8a1470
|
add fake best_price_menu
|
2019-09-01 17:22:53 +03:00 |
|
Dmitriy Kuzmenko
|
c85347b53a
|
add menu
|
2019-09-01 16:18:17 +03:00 |
|
Anatoly
|
998204b7c5
|
added created field to comments serializer
|
2019-09-01 15:24:55 +03:00 |
|
evgeniy-st
|
45f990af4c
|
update serializer
|
2019-09-01 15:07:27 +03:00 |
|
evgeniy-st
|
ef02e68c70
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-01 15:05:47 +03:00 |
|
evgeniy-st
|
0da20bbcd1
|
added awards to employee
|
2019-09-01 15:05:25 +03:00 |
|
Anatoly
|
a1fed35c69
|
Merge remote-tracking branch 'origin/develop' into develop
|
2019-09-01 15:02:38 +03:00 |
|
Anatoly
|
360f88d996
|
replace textfield with tjsonfield in model Review
|
2019-09-01 15:01:55 +03:00 |
|
evgeniy-st
|
ddabac60d1
|
Fix establishment retrieve view
|
2019-09-01 14:53:46 +03:00 |
|
evgeniy-st
|
abecc6f99a
|
update migrations
|
2019-09-01 14:42:41 +03:00 |
|
evgeniy-st
|
48ac4cceab
|
Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop
|
2019-09-01 14:33:43 +03:00 |
|
evgeniy-st
|
f10f6b23a0
|
Merge branch 'feature/employees' into develop
|
2019-09-01 14:33:25 +03:00 |
|
Anatoly
|
305da0e008
|
merge migrations
|
2019-09-01 14:31:42 +03:00 |
|
evgeniy-st
|
1b001f303a
|
extended establishment api enpoint by attribute of 'employees'
|
2019-09-01 14:17:03 +03:00 |
|
Anatoly
|
21dd87e0ec
|
Merge remote-tracking branch 'origin/develop' into features/comments
# Conflicts:
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 14:14:38 +03:00 |
|
Anatoly
|
1494bbbf36
|
Merge branch 'feature/reviews' into develop
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/models.py
# apps/establishment/serializers.py
|
2019-09-01 14:09:37 +03:00 |
|
Anatoly
|
cd0f03f05d
|
Merge remote-tracking branch 'origin/develop' into feature/reviews
# Conflicts:
# apps/establishment/admin.py
# apps/establishment/serializers.py
|
2019-09-01 14:06:17 +03:00 |
|
Dmitriy Kuzmenko
|
ef59216feb
|
change contacts for est.
|
2019-09-01 13:39:01 +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
|
3f90ef6dab
|
fix merge
|
2019-09-01 13:29:17 +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 |
|
Anatoly
|
c1738478ab
|
added new model Review
|
2019-09-01 13:24:37 +03:00 |
|
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 |
|