Commit Graph

3231 Commits

Author SHA1 Message Date
Олег Хаятов
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
Kuroshini
007ba58f7a partners create/fetch view 2020-01-29 18:22:58 +03:00
dormantman
19cf1b07d6 Added rud finding 2020-01-29 18:19:28 +03:00
Kuroshini
042d749d77 added pictures route && removed partners pictures duplicates 2020-01-29 17:53:25 +03:00
Kuroshini
6dd14ab80d transfer partners 2020-01-29 17:46:59 +03:00
Kuroshini
38d2e002b7 partners transfer 2020-01-29 17:16:42 +03:00
Kuroshini
65b0b56c71 transfer partners 2020-01-29 17:15:12 +03:00
Kuroshini
917e500838 partners transfer 2020-01-29 17:07:06 +03:00
Kuroshini
869aa7b4f4 partners transfer 2020-01-29 17:02:58 +03:00
Kuroshini
45acfa37c9 partners transfer 2020-01-29 17:00:19 +03:00
Anatoly
302e22045e fixes 2020-01-29 16:59:16 +03:00
Kuroshini
4fde19d23e fix partner transfer 2020-01-29 16:53:04 +03:00
dormantman
a6db15ed50 Added menu dishes 2020-01-29 16:11:53 +03:00
Kuroshini
28d4a5ae42 reorganize partner models 2020-01-29 15:21:51 +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
Kuroshini
fb3e8e5d71 hide remove news 2020-01-29 12:28:31 +03:00
a.gorbunov
6a6d623ef3 update roles list 2020-01-29 09:03:45 +00:00
Kuroshini
f58ac2a1cc partners 2020-01-28 23:21:16 +03:00
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
dormantman
e067e8e793 Added menu upload files 2020-01-28 18:29:02 +03:00
Kuroshini
9af6458dff translations for news types 2020-01-28 18:21:05 +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
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