dormantman
|
56b5af1291
|
Added district_name field
|
2020-01-28 15:49:00 +03:00 |
|
dormantman
|
d0e75ca07c
|
Added instagram/western_name fields
|
2020-01-28 15:46:23 +03:00 |
|
Олег Хаятов
|
d2926e487f
|
Merge branch 'feature/tune-comment-method' into 'develop'
tune get comments method
See merge request gm/gm-backend!243
|
2020-01-28 12:38:52 +00:00 |
|
a.gorbunov
|
a0a6e98fa6
|
resolve comments
|
2020-01-28 12:32:18 +00:00 |
|
a.gorbunov
|
028b8475b7
|
slug from content object
|
2020-01-28 12:16:18 +00:00 |
|
dormantman
|
3b7b778a8e
|
Change sending subscription searcher
|
2020-01-28 15:09:57 +03:00 |
|
a.gorbunov
|
8f752ae6a0
|
tune get comments method
|
2020-01-28 12:05:30 +00:00 |
|
Kuroshini
|
4c7088abbc
|
fix news again...
|
2020-01-28 14:58:41 +03:00 |
|
Kuroshini
|
baeb7e5b93
|
fix news update
|
2020-01-28 14:55:13 +03:00 |
|
Anatoly
|
236b532d98
|
refactored permission classes
|
2020-01-28 14:54:14 +03:00 |
|
Kuroshini
|
475de626ce
|
fix news update
|
2020-01-28 14:50:51 +03:00 |
|
dormantman
|
e89f04dee4
|
Added serializer parent region
|
2020-01-28 14:44:54 +03:00 |
|
alex
|
0dd86e53cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-28 14:37:04 +03:00 |
|
alex
|
193f1655e4
|
email cascade establishment
|
2020-01-28 14:36:54 +03:00 |
|
Kuroshini
|
cec7a58338
|
fix typo
|
2020-01-28 13:25:52 +03:00 |
|
alex
|
65a6feb4b2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2020-01-28 12:49:53 +03:00 |
|
alex
|
a02a52f2b0
|
menu dishes gallery api
|
2020-01-28 12:49:45 +03:00 |
|
Kuroshini
|
029cd36b98
|
localized cities #7
|
2020-01-28 12:35:30 +03:00 |
|
alex
|
c0f3aca532
|
menu gallery
|
2020-01-28 12:16:56 +03:00 |
|
Kuroshini
|
781779d54a
|
localized cities #6
|
2020-01-27 23:30:17 +03:00 |
|
Kuroshini
|
5c75b0a3ac
|
localized cities #5
|
2020-01-27 23:24:01 +03:00 |
|
Kuroshini
|
faeec9b4f2
|
localized cities #4
|
2020-01-27 23:22:53 +03:00 |
|
Kuroshini
|
e1b2c74988
|
localized cities #3
|
2020-01-27 23:19:25 +03:00 |
|
Kuroshini
|
ff34d66854
|
localized cities #2
|
2020-01-27 23:15:48 +03:00 |
|
Kuroshini
|
468527bc0e
|
localized cities #1
|
2020-01-27 23:13:22 +03:00 |
|
Олег Хаятов
|
a8fc46ed60
|
Merge branch 'feature/employees-params' into 'develop'
Feature/employees params
See merge request gm/gm-backend!240
|
2020-01-27 19:25:47 +00:00 |
|
dormantman
|
bb38bb3393
|
Change api view method
|
2020-01-27 22:22:17 +03:00 |
|
Kuroshini
|
4b0ef25baf
|
roles for email changing #2
|
2020-01-27 21:53:18 +03:00 |
|
Kuroshini
|
4cfe613739
|
roles for email changing
|
2020-01-27 21:47:04 +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 |
|
Kuroshini
|
1fc0627ca9
|
email superuser
|
2020-01-27 21:10:26 +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 |
|
Kuroshini
|
e60f4b817b
|
API method for possible news states
|
2020-01-27 20:04:36 +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
|
42d21a79a4
|
fix typo again =\
|
2020-01-27 19:46:17 +03:00 |
|
Kuroshini
|
9b6c70cf74
|
fix typo
|
2020-01-27 19:45:04 +03:00 |
|
Kuroshini
|
b9ee22c4a5
|
filter by states news
|
2020-01-27 19:44:07 +03:00 |
|
Kuroshini
|
7a66559307
|
remove obviously unnecessary field
|
2020-01-27 19:38:47 +03:00 |
|
Kuroshini
|
205e2fa996
|
optimize collections
|
2020-01-27 19:19:54 +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 |
|
Kuroshini
|
b6bfc51aad
|
fix issue w/ news update
|
2020-01-27 18:30:32 +03:00 |
|
Олег Хаятов
|
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 |
|
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 |
|
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 |
|