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 |
|
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
|
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
|
4e868c2d8d
|
transfer dishes
|
2019-10-29 08:25:03 +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 |
|
Anatoly
|
ed09ee78cc
|
small refactoring
|
2019-10-28 13:11:07 +03:00 |
|
Anatoly
|
65e7c965e4
|
added migrations
|
2019-10-28 12:46:10 +03:00 |
|
Anatoly
|
d12df5c8e1
|
added WineAppellation model
|
2019-10-28 12:33:48 +03:00 |
|
alex
|
4e0f3c9a4d
|
with address
|
2019-10-28 10:59:28 +03:00 |
|
alex
|
49dbc9c72e
|
Merge remote-tracking branch 'origin/migrate-location-app' into origin/feature/migrate-etablishment
|
2019-10-28 10:22:33 +03:00 |
|
littlewolf
|
7feed3ac8f
|
Move address transfer to dictionaries
|
2019-10-28 10:14:11 +03:00 |
|
littlewolf
|
3622ac22b9
|
Add migrations
|
2019-10-28 10:13:43 +03:00 |
|
littlewolf
|
7d556df8d5
|
Add address serializer
|
2019-10-28 10:13:01 +03:00 |
|
alex
|
281d57996e
|
fix null timezone
|
2019-10-28 09:24:56 +03:00 |
|
littlewolf
|
25d58a8bc5
|
Fix and add city transfer
|
2019-10-28 07:19:17 +03:00 |
|
littlewolf
|
255b1ad5f1
|
Fix queryset conditions
|
2019-10-28 00:15:37 +03:00 |
|
littlewolf
|
0d30543664
|
Fix regions with subregions
|
2019-10-27 21:43:34 +03:00 |
|
littlewolf
|
07f226604e
|
Fix regions without subregion
|
2019-10-27 20:31:41 +03:00 |
|
Anatoly
|
e41b539ed7
|
added wine region
|
2019-10-27 18:42:51 +03:00 |
|
littlewolf
|
0db2638eb8
|
Fix country queryset
|
2019-10-27 17:23:04 +03:00 |
|
alex
|
3b68a4dc19
|
establishment fin fix 1
|
2019-10-27 16:47:08 +03:00 |
|
alex
|
25a2edf17d
|
establishment fin
|
2019-10-27 16:23:30 +03:00 |
|
littlewolf
|
7eb241ffed
|
Tmp commit
|
2019-10-27 12:47:45 +03:00 |
|
alex
|
16f06ce2f1
|
fix news slug
|
2019-10-26 22:02:38 +03:00 |
|
alex
|
490fae3c00
|
Merge branch 'origin/feature/migration' into origin/feature/migrate-etablishment
# Conflicts:
# apps/transfer/management/commands/transfer.py
|
2019-10-26 20:47:49 +03:00 |
|
Anatoly
|
37d745eeaa
|
added endpoints, filters, serializers and extend model Product, ProductType, ProductSubtype
|
2019-10-26 18:54:22 +03:00 |
|
littlewolf
|
8bcf4c9ca0
|
Add child regions
|
2019-10-26 09:35:09 +03:00 |
|
littlewolf
|
cd724de65f
|
Move countries to dictionaries
|
2019-10-26 09:19:34 +03:00 |
|
littlewolf
|
06b12f9427
|
Add country transfer
|
2019-10-26 09:18:45 +03:00 |
|
littlewolf
|
7e757aa63f
|
Merge branch 'origin/feature/migration' into migrate-location-app
# Conflicts:
# apps/gallery/models.py
# apps/location/transfer_data.py
# apps/transfer/management/commands/transfer.py
# project/settings/base.py
# requirements/base.txt
|
2019-10-26 08:45:12 +03:00 |
|
littlewolf
|
e72e92244b
|
Update country serializer
|
2019-10-26 08:42:00 +03:00 |
|
Semyon Yekhmenin
|
e1e0f1e997
|
Added index_name in employee position
|
2019-10-25 13:41:53 +00:00 |
|
Anatoly
|
7d0acba51b
|
added to same_theme and should_read preview_image_url, added UniqueConstraint to NewsGallery model
|
2019-10-25 16:18:16 +03:00 |
|
evgeniy-st
|
174e580c20
|
Merge branch 'feature/search-by-type' into develop
|
2019-10-25 16:07:38 +03:00 |
|
evgeniy-st
|
d4fe5ebd2d
|
search by type & subtype
|
2019-10-25 16:06:52 +03:00 |
|
Виктор Гладких
|
fb770f8e2a
|
Fix merge
|
2019-10-25 15:56:02 +03:00 |
|
Виктор Гладких
|
a38fed847a
|
Fix roles
|
2019-10-25 15:51:07 +03:00 |
|
Виктор Гладких
|
b7831b9739
|
Fix IsContentPageManager
|
2019-10-25 15:25:35 +03:00 |
|
Kuroshini
|
4eaa600fc1
|
Fix all tests
|
2019-10-25 14:13:54 +03:00 |
|
Kuroshini
|
dd0b595132
|
Review fixes
|
2019-10-25 14:13:19 +03:00 |
|
Kuroshini
|
7f23f0e891
|
Establishment each hour reindexing
|
2019-10-25 14:13:19 +03:00 |
|
Semyon Yekhmenin
|
91f6503a26
|
Added country name to site settings
|
2019-10-25 10:54:01 +00:00 |
|
michail
|
3e34dcda91
|
Merge remote-tracking branch 'origin/origin/feature/migration' into origin/feature/migration
|
2019-10-25 15:43:05 +05:00 |
|
michail
|
76d6e22fb9
|
added transfer for advertisement
|
2019-10-25 15:42:54 +05:00 |
|
Виктор Гладких
|
7f4b46dbf8
|
Fix country admin
|
2019-10-25 12:42:01 +03:00 |
|
littlewolf
|
abe8eae655
|
Tmp
|
2019-10-25 12:27:38 +03:00 |
|
alex
|
0f595ee40b
|
merge migrations
|
2019-10-25 12:07:02 +03:00 |
|
alex
|
09647fa4d3
|
start transfer_data
|
2019-10-25 12:03:43 +03:00 |
|
michail
|
d79946633e
|
fix get_description for recipe.py
|
2019-10-25 13:17:35 +05:00 |
|
Dmitriy Kuzmenko
|
72713badff
|
remove print from tests
|
2019-10-25 11:04:40 +03:00 |
|
Виктор Гладких
|
046d0c5fe6
|
Fix country and comment role
|
2019-10-25 10:59:31 +03:00 |
|
Виктор Гладких
|
c33ea42b8e
|
Merge branch 'develop' into feature/fix_role
|
2019-10-25 10:15:38 +03:00 |
|