Commit Graph

2594 Commits

Author SHA1 Message Date
Kuroshini
8806bc4e33 fix transfer script 2020-01-28 21:27:45 +03:00
Kuroshini
24f4abc76d fix transfer partners 2020-01-28 21:18:25 +03:00
Kuroshini
d2e28f519a fix migration 2020-01-28 21:00:02 +03:00
Kuroshini
577098e6ca partners changed relation 2020-01-28 20:58:54 +03:00
Kuroshini
8b014a7923 finally fix issue w/ news patch 2020-01-28 19:24:27 +03:00
alex
d9ff3227dc address read only 2020-01-28 18:54:27 +03:00
Anatoly
61d2f6ec46 added filter - establishment_id, refactored guide counters 2020-01-28 17:52:49 +03:00
Kuroshini
4604c81ede change news states 2020-01-28 17:50:46 +03:00
Anton Gorbunov
a0aad97a4d Merge branch 'feature/tune-comment-method' into 'develop'
fix route

See merge request gm/gm-backend!245
2020-01-28 13:57:07 +00:00
a.gorbunov
121b917096 fix route 2020-01-28 13:56:32 +00:00
Олег Хаятов
2b0663b702 Merge branch 'bug/establishment-fields' into 'develop'
Bug/establishment fields

See merge request gm/gm-backend!244
2020-01-28 13:35:15 +00:00
dormantman
191c168c99 Added migrations 2020-01-28 15:49:50 +03:00
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
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