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
|
2ce69eb003
|
added establishment tag identifier to TagListAPIView
|
2019-09-19 17:10:18 +03:00 |
|
Anatoly
|
a09d6b28f1
|
Merge branch 'feature/gm-80' into develop
# Conflicts:
# apps/establishment/serializers/back.py
|
2019-09-19 14:32:10 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
fd0a491e89
|
Merge branch 'develop' into feature/employee_crud
|
2019-09-19 10:10:31 +03:00 |
|
Semyon Yekhmenin
|
f700491d42
|
Added employee position priority
|
2019-09-19 07:02:45 +00:00 |
|
Anatoly
|
540a819f94
|
gm-80: in progress
|
2019-09-18 18:46:24 +03:00 |
|
ВашÐВиктор ГладкихÐ
|
a1ea35fce1
|
CRUD logic for employee
|
2019-09-18 18:12:49 +03:00 |
|
Semyon Yekhmenin
|
bb5e294d6e
|
Fixed preview image crop
|
2019-09-18 13:52:09 +00:00 |
|
Kuroshini
|
4ee6306efb
|
Add transportation text field to establishment model
|
2019-09-17 13:47:41 +03:00 |
|
Dmitriy Kuzmenko
|
15f02b72ca
|
add email and phone api for establishments
|
2019-09-13 12:20:36 +03:00 |
|
Dmitriy Kuzmenko
|
10d9b52bec
|
Merge remote-tracking branch 'origin/develop' into feature/backoffice
|
2019-09-12 18:27:04 +03:00 |
|
Dmitriy Kuzmenko
|
efac785248
|
add api for estab, social, plates, menu
|
2019-09-12 18:24:21 +03:00 |
|