Олег Хаятов
|
f3cea9987e
|
Merge branch 'feature/subscriptions' into 'develop'
Feature/subscriptions
See merge request gm/gm-backend!242
|
2020-01-27 15:24:43 +00:00 |
|
Kuroshini
|
a8630661d8
|
fix state
|
2020-01-27 17:30:09 +03:00 |
|
Kuroshini
|
bf60479c66
|
user short name serializer added username
|
2020-01-27 15:38:06 +03:00 |
|
Kuroshini
|
21006e77cb
|
user id in self info
|
2020-01-27 15:16:29 +03:00 |
|
Kuroshini
|
8be85707c7
|
fix published news
|
2020-01-27 14:15:10 +03:00 |
|
Anatoly
|
e1c1662819
|
refactored filters for partner view
|
2020-01-27 13:19:53 +03:00 |
|
Kuroshini
|
b1817061db
|
try to fix subscriptions #4
|
2020-01-27 12:53:37 +03:00 |
|
Kuroshini
|
7386887f49
|
state fields for BO
|
2020-01-27 11:24:59 +03:00 |
|
Anatoly
|
bcecb39ee2
|
disable checking on email field in UserDetailSerializer
|
2020-01-27 11:11:24 +03:00 |
|
Anton Gorbunov
|
d49b00e008
|
Merge branch 'feature/optimize-back-collection' into 'develop'
select related before load
See merge request gm/gm-backend!241
|
2020-01-27 06:42:26 +00:00 |
|
a.gorbunov
|
1d3cf9dac0
|
select related before load
|
2020-01-27 06:41:52 +00: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 |
|
Kuroshini
|
2e4daaf9a1
|
try to fix subscriptions #3
|
2020-01-24 19:02:22 +03:00 |
|
Kuroshini
|
03946d0626
|
try to fix subscriptions #2
|
2020-01-24 18:52:36 +03:00 |
|
Kuroshini
|
e998865de5
|
try to fix subscriptions
|
2020-01-24 18:49:08 +03:00 |
|
dormantman
|
8acb86a5ab
|
Added history to subscriptions
|
2020-01-24 18:25:17 +03:00 |
|
Anatoly
|
0ad1408f18
|
added account removal action
|
2020-01-24 18:13:01 +03:00 |
|
Kuroshini
|
0f73cf9477
|
fix news agenda
|
2020-01-24 18:08:51 +03:00 |
|
Anatoly
|
38a6508396
|
modified role model
|
2020-01-24 18:04:32 +03:00 |
|
Kuroshini
|
c82362b268
|
should_read same country
|
2020-01-24 17:54:37 +03:00 |
|
dormantman
|
5a1d33c981
|
Remove save
|
2020-01-24 17:52:47 +03:00 |
|
Anatoly
|
36c4641ed0
|
fix plates transfer
|
2020-01-24 17:49:42 +03:00 |
|
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 |
|