Anatoly
|
25c63b8097
|
Merge branch 'develop' into feature/roles
# Conflicts:
# apps/account/models.py
# apps/collection/views/back.py
# apps/comment/views/back.py
# apps/establishment/models.py
# apps/establishment/views/back.py
# apps/news/views.py
# apps/partner/views/back.py
|
2020-01-30 10:56:46 +03:00 |
|
Anatoly
|
57e63111fb
|
intermediate commit
|
2020-01-30 10:28:01 +03:00 |
|
Олег Хаятов
|
0e7fd39d37
|
Merge branch 'feature/bo-menus' into 'develop'
Feature/bo menus
See merge request gm/gm-backend!247
|
2020-01-29 15:54:44 +00:00 |
|
dormantman
|
e9646acfe1
|
Add migration
|
2020-01-29 18:38:15 +03:00 |
|
dormantman
|
19cf1b07d6
|
Added rud finding
|
2020-01-29 18:19:28 +03:00 |
|
Anatoly
|
302e22045e
|
fixes
|
2020-01-29 16:59:16 +03:00 |
|
dormantman
|
a6db15ed50
|
Added menu dishes
|
2020-01-29 16:11:53 +03:00 |
|
dormantman
|
bcc5f2da51
|
Added menus method
|
2020-01-29 15:17:15 +03:00 |
|
Kuroshini
|
63fa81385e
|
western_name creation
|
2020-01-29 14:41:34 +03:00 |
|
alex
|
d9ff3227dc
|
address read only
|
2020-01-28 18:54:27 +03:00 |
|
dormantman
|
e067e8e793
|
Added menu upload files
|
2020-01-28 18:29:02 +03:00 |
|
Anatoly
|
61d2f6ec46
|
added filter - establishment_id, refactored guide counters
|
2020-01-28 17:52:49 +03:00 |
|
dormantman
|
191c168c99
|
Added migrations
|
2020-01-28 15:49:50 +03:00 |
|
dormantman
|
d0e75ca07c
|
Added instagram/western_name fields
|
2020-01-28 15:46:23 +03:00 |
|
Anatoly
|
236b532d98
|
refactored permission classes
|
2020-01-28 14:54:14 +03:00 |
|
alex
|
193f1655e4
|
email cascade establishment
|
2020-01-28 14:36:54 +03:00 |
|
alex
|
a02a52f2b0
|
menu dishes gallery api
|
2020-01-28 12:49:45 +03:00 |
|
alex
|
c0f3aca532
|
menu gallery
|
2020-01-28 12:16:56 +03:00 |
|
dormantman
|
bb38bb3393
|
Change api view method
|
2020-01-27 22:22:17 +03:00 |
|
dormantman
|
d51d304077
|
Refactor (structure)
|
2020-01-27 21:45:14 +03:00 |
|
Kuroshini
|
415c9b7851
|
fix
|
2020-01-27 21:18:48 +03:00 |
|
dormantman
|
095e482358
|
Optimize method
|
2020-01-27 20:59:19 +03:00 |
|
dormantman
|
e94787716e
|
Change labels
|
2020-01-27 20:33:51 +03:00 |
|
dormantman
|
b687eb6024
|
Change format method
|
2020-01-27 20:29:54 +03:00 |
|
Ruslan Stepanov
|
1d534fe1a8
|
Merge branch 'develop' into 'feature/employees-params'
# Conflicts:
# apps/establishment/serializers/back.py
# apps/establishment/views/back.py
|
2020-01-27 17:04:15 +00:00 |
|
dormantman
|
f45eae56e9
|
Added new features
|
2020-01-27 20:03:42 +03:00 |
|
dormantman
|
3796a698d2
|
Added employee-establishment-positions method
|
2020-01-27 20:01:44 +03:00 |
|
Kuroshini
|
8a1651bf1f
|
fix permission
|
2020-01-27 18:45:50 +03:00 |
|
Kuroshini
|
f5da5f71a3
|
base related qs for cities
|
2020-01-27 18:45:23 +03:00 |
|
dormantman
|
d2f04d4958
|
Reformat method structure
|
2020-01-25 00:42:00 +03:00 |
|
dormantman
|
dd49ee7b6c
|
Reformat restaurant to name
|
2020-01-24 22:37:06 +03:00 |
|
dormantman
|
809b5ccab7
|
Fixed employee establishments method
|
2020-01-24 22:33:39 +03:00 |
|
Anatoly
|
38a6508396
|
modified role model
|
2020-01-24 18:04:32 +03:00 |
|
alex
|
ec351bf12a
|
fix plate
|
2020-01-24 16:44:16 +03:00 |
|
Kuroshini
|
5353c5a67c
|
fix award unbind
|
2020-01-24 15:46:07 +03:00 |
|
alex
|
34055d3669
|
fix plate_set
|
2020-01-24 13:31:00 +03:00 |
|
alex
|
a195ed3a53
|
menu dishes rud
|
2020-01-24 10:35:55 +03:00 |
|
alex
|
22b1b3064d
|
is_drinks_included and last_update in serializer
|
2020-01-24 10:31:07 +03:00 |
|
alex
|
29a7fb82ce
|
dishes menu list-create
|
2020-01-24 10:21:35 +03:00 |
|
alex
|
792c11e128
|
transfer formulas menu
|
2020-01-24 09:20:22 +03:00 |
|
alex
|
9b6918b3b0
|
menu old_id for transfer
|
2020-01-24 08:59:11 +03:00 |
|
Kuroshini
|
34977db805
|
fix permission
|
2020-01-23 21:03:24 +03:00 |
|
Kuroshini
|
d8d9a97746
|
remove award from employee
|
2020-01-23 21:02:43 +03:00 |
|
alex
|
7391463f5a
|
uploads model for menu
|
2020-01-23 14:47:55 +03:00 |
|
alex
|
874de420f6
|
drinks and schedule for menu
|
2020-01-23 14:17:29 +03:00 |
|
alex
|
e5faa90c76
|
multiply filters for employee
|
2020-01-23 13:54:36 +03:00 |
|
Kuroshini
|
a6f3384126
|
change employees search precision const
|
2020-01-23 11:26:08 +03:00 |
|
dormantman
|
8fb8c49bfe
|
Added employee positions method
|
2020-01-22 18:48:16 +03:00 |
|
a.gorbunov
|
24c352aeac
|
fix country_id
|
2020-01-22 13:53:28 +00:00 |
|
Kuroshini
|
0023fcb47b
|
fix photos
|
2020-01-22 12:19:16 +03:00 |
|