Commit Graph

25 Commits

Author SHA1 Message Date
Anatoly
38ba443b47 gm-80: complete 2019-09-19 11:26:54 +03:00
Anatoly
540a819f94 gm-80: in progress 2019-09-18 18:46:24 +03:00
Dmitriy Kuzmenko
c3717ecfd9 merge transportation 2019-09-17 17:16:35 +03:00
Dmitriy Kuzmenko
6d873d66a2 Merge remote-tracking branch 'origin/feature/establishment_transportation_field' into develop
# Conflicts:
#	apps/establishment/models.py
2019-09-17 17:07:29 +03:00
Anatoly
27a1998dbc GM-73: Логика похожих ресторанов 2019-09-17 15:36:33 +03:00
Kuroshini
4ee6306efb Add transportation text field to establishment model 2019-09-17 13:47:41 +03:00
Dmitriy Kuzmenko
efac785248 add api for estab, social, plates, menu 2019-09-12 18:24:21 +03:00
Anatoly
605c81b33c replace comment model from establishment app, added new app comment 2019-09-04 18:47:06 +03:00
evgeniy-st
a2ef5bbfd5 small refactor 2019-09-02 12:00:19 +03:00
Dmitriy Kuzmenko
2f692bacf3 add migrate 2019-09-01 17:52:01 +03:00
evgeniy-st
6d6e1169a4 extended establishment model (social) 2019-09-01 17:30:39 +03:00
Dmitriy Kuzmenko
c85347b53a add menu 2019-09-01 16:18:17 +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
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
Dmitriy Kuzmenko
ef59216feb change contacts for est. 2019-09-01 13:39:01 +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
3aa1e92046 added table EstablishmentSchedule, added application timetable, added table Timetable 2019-08-29 17:59:09 +03:00
evgeniy-st
1aef1a5bb1 Translation & establishment 2019-08-28 15:21:28 +03:00
evgeniy-st
910027d10f update establishment model, migrations 2019-08-27 14:23:11 +03:00
evgeniy-st
f82784cd19 update establishment-list endpoint 2019-08-27 12:33:16 +03:00
evgeniy-st
bb284420c4 initial app 2019-08-26 18:07:01 +03:00