dormantman
|
62ab6248ba
|
Fix subscribes
|
2020-01-24 17:43:51 +03:00 |
|
Kuroshini
|
3254573897
|
country name translated for roles
|
2020-01-24 16:50:49 +03:00 |
|
alex
|
ec351bf12a
|
fix plate
|
2020-01-24 16:44:16 +03:00 |
|
Kuroshini
|
cd0317d94d
|
image for city is not longer required field
|
2020-01-24 15:48:02 +03:00 |
|
Kuroshini
|
5353c5a67c
|
fix award unbind
|
2020-01-24 15:46:07 +03:00 |
|
dormantman
|
25488ca2fb
|
Added new mobile route
|
2020-01-24 15:38:34 +03:00 |
|
dormantman
|
a82d6685a9
|
Fix news content-pages mixin
|
2020-01-24 15:08:42 +03:00 |
|
Ruslan Stepanov
|
a2f537a5ac
|
Update content-pages
|
2020-01-24 11:59:13 +00:00 |
|
alex
|
34055d3669
|
fix plate_set
|
2020-01-24 13:31:00 +03:00 |
|
Kuroshini
|
3f3848e317
|
fix crop
|
2020-01-24 13:23:54 +03:00 |
|
Kuroshini
|
28718d17d1
|
aspect for crop
|
2020-01-24 13:02:32 +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
|
0f053dff32
|
return employee after binding
|
2020-01-23 23:24:03 +03:00 |
|
Kuroshini
|
f52016bfee
|
create award for employee and bind
|
2020-01-23 22:56:01 +03:00 |
|
Олег Хаятов
|
e8c043d2ed
|
Merge branch 'feature/advertisement-br' into 'develop'
Added mobile method
See merge request gm/gm-backend!238
|
2020-01-23 18:13:35 +00:00 |
|
dormantman
|
7c404df718
|
Added mobile method
|
2020-01-23 21:08:09 +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 |
|
Anton Gorbunov
|
1c1d9ecbad
|
Merge branch 'bug/order-regions' into 'develop'
added order field
See merge request gm/gm-backend!237
|
2020-01-23 17:54:49 +00:00 |
|
a.gorbunov
|
1d8d18d4de
|
added order field
|
2020-01-23 17:54:18 +00:00 |
|
Kuroshini
|
f70a3abb8c
|
award types list view
|
2020-01-23 20:26:22 +03:00 |
|
Kuroshini
|
e0c2138ba7
|
fix crops
|
2020-01-23 19:33:02 +03:00 |
|
Kuroshini
|
4002e684d5
|
fix god damned content-pages
|
2020-01-23 18:34:52 +03:00 |
|
Kuroshini
|
dd1b241c41
|
verbose award_type for API
|
2020-01-23 18:26:09 +03:00 |
|
dormantman
|
3ebd859686
|
Fix content-pages
|
2020-01-23 18:14:26 +03:00 |
|
Kuroshini
|
591fdc9d6a
|
fix content-pages
|
2020-01-23 18:10:17 +03:00 |
|
Kuroshini
|
d27a47f905
|
Revert "Revert "Revert (nickname field) common.py""
This reverts commit f9c5bdc
|
2020-01-23 18:03:06 +03:00 |
|
Kuroshini
|
6d2aee572a
|
fix configs
|
2020-01-23 18:02:26 +03:00 |
|
Kuroshini
|
f9c5bdceee
|
Revert "Revert (nickname field) common.py"
This reverts commit 5560a01
|
2020-01-23 18:02:26 +03:00 |
|
Олег Хаятов
|
2d2442e8bd
|
Merge branch 'feature/content-pages' into 'develop'
Added 404 pages
See merge request gm/gm-backend!236
|
2020-01-23 14:59:51 +00:00 |
|
dormantman
|
f899de0369
|
Added check to news mixin
|
2020-01-23 17:59:18 +03:00 |
|
dormantman
|
79001be037
|
Added 404 pages
|
2020-01-23 17:53:13 +03:00 |
|
Олег Хаятов
|
976e35cbd9
|
Merge branch 'feature/content-pages' into 'develop'
Feature/content pages
See merge request gm/gm-backend!232
|
2020-01-23 14:50:38 +00:00 |
|
dormantman
|
d98a6aeb00
|
Change structure
|
2020-01-23 17:45:59 +03:00 |
|
dormantman
|
0c40ed06e1
|
Changed to text/html response
|
2020-01-23 17:38:55 +03:00 |
|
Anatoly
|
6b819e2ed4
|
modified search filter for backoffice account view
|
2020-01-23 17:32:31 +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 |
|
dormantman
|
18978355bc
|
Change method model
|
2020-01-23 13:56:17 +03:00 |
|
alex
|
684c3efcf8
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-23 13:54:49 +03:00 |
|
alex
|
e5faa90c76
|
multiply filters for employee
|
2020-01-23 13:54:36 +03:00 |
|
Anatoly
|
587f6c0bad
|
fix role counter, added additional field role choice id
|
2020-01-23 13:29:09 +03:00 |
|
Kuroshini
|
a6f3384126
|
change employees search precision const
|
2020-01-23 11:26:08 +03:00 |
|
Ruslan Stepanov
|
5560a0149d
|
Revert (nickname field) common.py
|
2020-01-23 07:40:56 +00:00 |
|
evgeniy-st
|
0216cadd85
|
remove sentry
|
2020-01-23 10:02:19 +03:00 |
|
Kuroshini
|
d81d2445f5
|
tune news search for BO
|
2020-01-22 21:47:21 +03:00 |
|