Commit Graph

75 Commits

Author SHA1 Message Date
Dmitriy Kuzmenko
e91a64ad6b add website 2019-09-01 17:51:13 +03:00
evgeniy-st
6d6e1169a4 extended establishment model (social) 2019-09-01 17:30:39 +03:00
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
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
3f90ef6dab fix merge 2019-09-01 13:29:17 +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
evgeniy-st
805bda3267 Extend establishment filterset 2019-08-30 17:25:07 +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
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
Dmitriy Kuzmenko
262e98b9e1 add awards 2019-08-28 10:15:17 +03:00
evgeniy-st
c04771ca58 recalculate price level preview version 2019-08-27 16:53:05 +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