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 |
|
michail
|
4a9361e04f
|
fix notification.py
|
2019-10-29 12:50:05 +05:00 |
|
Dmitriy Kuzmenko
|
0990b8e4dd
|
Merge branch 'origin/feature/migrate-etablishment' of ssh://gl.id-east.ru:222/gm/gm-backend into origin/feature/migrate-etablishment
|
2019-10-29 10:36:17 +03:00 |
|
Dmitriy Kuzmenko
|
411bef5272
|
change admin for news
|
2019-10-29 10:30:08 +03:00 |
|
alex
|
939d7f139f
|
fix max max length error
|
2019-10-29 10:20:30 +03:00 |
|
alex
|
adcc43309b
|
fix settings
|
2019-10-29 08:26:52 +03:00 |
|
alex
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +03:00 |
|
Kuroshini
|
4cb44aa1fc
|
Rename
|
2019-10-28 18:44:31 +03:00 |
|
Kuroshini
|
76841af575
|
Booking notes & subscriber
|
2019-10-28 18:43:41 +03:00 |
|
Dmitriy Kuzmenko
|
5bfbafa865
|
fix disable signal of elsatic
|
2019-10-28 17:33:53 +03:00 |
|
Dmitriy Kuzmenko
|
bff4c70fc8
|
disable signal of elsatic
|
2019-10-28 17:32:15 +03:00 |
|
alex
|
c15b5976fb
|
fix ruby schedules
|
2019-10-28 17:07:32 +03:00 |
|
Kuroshini
|
37fb67cbb3
|
Fix subqueries
|
2019-10-28 14:40:39 +03:00 |
|