Commit Graph

23 Commits

Author SHA1 Message Date
Anatoly
ddb3eec679 finished endpoint to get tags by establishment type and subtype 2019-10-11 15:41:31 +03:00
Anatoly
d321866dc2 gm-192: in progress 2019-10-08 15:38:35 +03:00
Dmitriy Kuzmenko
5a36613c97 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	apps/establishment/urls/back.py
2019-09-19 17:19:40 +03:00
Dmitriy Kuzmenko
2164e30aef chnage image field to image_url in establishments 2019-09-19 17:18:08 +03:00
Anatoly
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
Anatoly
605c81b33c replace comment model from establishment app, added new app comment 2019-09-04 18:47:06 +03:00
Dmitriy Kuzmenko
c85347b53a add menu 2019-09-01 16:18:17 +03:00
evgeniy-st
f10f6b23a0 Merge branch 'feature/employees' into develop 2019-09-01 14:33:25 +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
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
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
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
Dmitriy Kuzmenko
9a7052026b add metadata 2019-08-29 14:51:55 +03:00
Dmitriy Kuzmenko
253da87a99 URL refactoring 2019-08-28 11:35:38 +03:00
Dmitriy Kuzmenko
262e98b9e1 add awards 2019-08-28 10:15:17 +03:00
evgeniy-st
6667047537 establishment admin conf 2019-08-27 14:23:41 +03:00
evgeniy-st
bb284420c4 initial app 2019-08-26 18:07:01 +03:00