Commit Graph

1393 Commits

Author SHA1 Message Date
Kuroshini
d4792cb342 Geo subtypes 2019-10-30 14:34:07 +03:00
e.stoyushko
94dcd9c950 Merge branch 'feature/schedule-order-id' into 'develop'
Weekday for mobile devices

See merge request gm/gm-backend!85
2019-10-30 11:25:59 +00:00
Anatoly
6fcfb263d3 fix ProductModelAdmin 2019-10-30 14:23:40 +03:00
Kuroshini
42c596b592 Weekday for mobile devices 2019-10-30 14:19:03 +03:00
alex
c521839389 news refactor 2019-10-30 13:53:12 +03:00
littlewolf
a67df32086 Fix establishment_mark 2019-10-30 12:55:44 +03:00
littlewolf
f690ad3b8f Fix key 2019-10-30 12:48:04 +03:00
littlewolf
37c3a43932 Mv reviews to mention command 2019-10-30 12:31:38 +03:00
littlewolf
86e0699c8c Add reviews transfer
Add language transfer
Fix comment transfer
2019-10-30 12:31:38 +03:00
littlewolf
c564f4fd67 Fix rewiewers 2019-10-30 12:31:38 +03:00
littlewolf
9310bff319 Add comment serializer 2019-10-30 12:31:38 +03:00
evgeniy-st
7805a63055 remove establishment document filtering by country code 2019-10-30 12:15:40 +03:00
evgeniy-st
00bcd6c205 added merge migrations 2019-10-30 11:59:19 +03:00
evgeniy-st
e371fdceea Merge branch 'develop' into migration_fix 2019-10-30 11:50:30 +03:00
Виктор Гладких
156a5479aa Fix 2019-10-30 11:42:23 +03:00
Виктор Гладких
24ee90e8a0 Fix fab 2019-10-30 10:56:48 +03:00
Виктор Гладких
9e6634f1a6 Fix fab 2019-10-30 10:48:59 +03:00
e.stoyushko
c9edaaa654 Merge branch 'feature/geo-type-index-name' into 'develop'
Feature/geo type index name

See merge request gm/gm-backend!84
2019-10-30 07:31:50 +00:00
alex
e524483ed0 fix ass_publish_data 2019-10-30 08:03:30 +03:00
alex
a0c52d8ef9 Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix 2019-10-29 21:57:07 +03:00
Dmitriy Kuzmenko
a3bf921771 fix timezone 2019-10-29 21:54:59 +03:00
alex
0a7a5e57f4 Merge remote-tracking branch 'origin/migration_fix' into migration_fix 2019-10-29 21:54:14 +03:00
alex
55bdc7771f add image to establishment 2019-10-29 21:54:03 +03:00
Kuroshini
a0aa503cfa Add index_name type field to geo 2019-10-29 20:56:41 +03:00
evgeniy-st
9fecbfe98f EstablishmentViewSet default ordering and filtration 2019-10-29 19:17:44 +03:00
evgeniy-st
3f233fd246 update establishment document index & establishment documentview 2019-10-29 18:13:21 +03:00
Anatoly
5675f23fae fixed BaseModelAdminMixin 2019-10-29 18:12:52 +03:00
Anatoly
5984fdc7cd fixed BaseModelAdminMixin 2019-10-29 17:57:11 +03:00
Anatoly
71f2f8a574 small fix for establishment model admin 2019-10-29 17:44:03 +03:00
Dmitriy Kuzmenko
c32b665b92 enable elastic 2019-10-29 17:17:24 +03:00
alex
b41ec3eebd add is_publish 2019-10-29 17:16:51 +03:00
Anatoly
03c75efece gm-259, gm-260, gm-261 2019-10-29 17:16:39 +03:00
alex
59371fae9a Merge remote-tracking branch 'origin/origin/migration_fix' into migration_fix 2019-10-29 16:43:27 +03:00
alex
f929c096bc add subtitle like a description 2019-10-29 16:42:43 +03:00
Dmitriy Kuzmenko
e270131679 Merge branch 'develop' into origin/migration_fix 2019-10-29 15:27:40 +03:00
Dmitriy Kuzmenko
8fd14f2f44 Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/migration_fix 2019-10-29 15:27:19 +03:00
Anatoly
13eaa94261 added filter to FavoritesEstablishmentListView 2019-10-29 15:23:26 +03:00
evgeniy-st
251edda2ea update Document ViewSet's pagination class 2019-10-29 15:19:07 +03:00
Dmitriy Kuzmenko
03bf648ef9 add change admin for establishments 2019-10-29 15:08:54 +03:00
Dmitriy Kuzmenko
30ba313f54 add filter accounts for existing users 2019-10-29 14:47:57 +03:00
Dmitriy Kuzmenko
631ffd265a add mixin for admin panel 2019-10-29 14:46:44 +03:00
Dmitriy Kuzmenko
97f75dfc05 add filter accounts for existing users 2019-10-29 14:32:51 +03:00
Anatoly
8cf2cebe85 added BaseModelAdminMixin 2019-10-29 14:01:27 +03:00
alex
dc11fb055f fix news and paris establishments 2019-10-29 12:34:08 +03:00
alex
e68e33859d Merge remote-tracking branch 'origin/origin/feature/migrate-etablishment' into origin/feature/migration 2019-10-29 12:31:32 +03:00
alex
b84eb68dd9 Merge branch 'feature/migrate-menu' into origin/feature/migration 2019-10-29 12:18:18 +03:00
littlewolf
338c4a4901 Add migration 2019-10-29 12:16:18 +03:00
littlewolf
099e450eb9 Merge branch 'add-user-old_id' into origin/feature/migrate-etablishment 2019-10-29 11:31:04 +03:00
littlewolf
72c6545a34 Add old_id to account_user 2019-10-29 11:30:33 +03:00
michail
7613ece6f8 new fix notification.py 2019-10-29 13:09:13 +05:00