Commit Graph

247 Commits

Author SHA1 Message Date
alex
49e5e4ea91 test establishment and news carousel 2019-11-25 09:38:50 +03:00
alex
fa183bfc92 carousel back api url 2019-11-22 17:00:43 +03:00
alex
7e878956e3 carousel api for news 2019-11-22 16:22:31 +03:00
alex
429825804a create destroy mixin 2019-11-22 15:07:50 +03:00
Semyon Yekhmenin
120e686be6 Changed in_favorites field to read only 2019-11-22 11:46:24 +00:00
evgeniy-st
04d6412f39 Merge branch 'develop' into feature/in_favorites 2019-11-21 18:18:09 +03:00
evgeniy-st
35b6a66c85 In favorites 2019-11-21 18:12:52 +03:00
Semyon Yekhmenin
4209b38d93 Fixed is_published filed type in serializer 2019-11-21 14:46:56 +00:00
Semyon Yekhmenin
98e140b0c4 Feature/news web view update 2019-11-21 14:12:22 +00:00
Anatoly
617552841f refactored product, fix transfer and etc., see changelist 2019-11-21 09:58:43 +03:00
Semyon Yekhmenin
7d8e4c96f1 Added filter by type for bo news list 2019-11-19 12:13:43 +00:00
Kuroshini
f6e5f84889 fix issue w/ empty tags 2019-11-18 22:41:14 +03:00
Kuroshini
5c4c4c60c3 ES as separate server 2019-11-18 20:12:58 +03:00
Anatoly
0d2f961ad5 added temporary potential bug (change auto_crop_images dict names for News) 2019-11-17 21:52:07 +03:00
Anatoly
62c4ab8d74 added temporary potential bug (change auto_crop_images dict names for News) 2019-11-17 20:39:03 +03:00
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
Олег Хаятов
ae53a18e08 Merge branch 'feature/filter-favs-by-tag' into 'develop'
Filters for news favorites

See merge request gm/gm-backend!133
2019-11-15 15:51:09 +00:00
Kuroshini
153ccd7bd9 International news 2019-11-15 18:25:40 +03:00
alex
71dd52c194 news in_favs nested fix 2019-11-15 15:28:27 +03:00
Dmitriy Kuzmenko
4a53cca6c0 Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop 2019-11-15 12:15:03 +03:00
Dmitriy Kuzmenko
41c842e224 change review transfer 2019-11-15 12:14:53 +03:00
alex
0dbb2c64cd fix new in_fav detail 2019-11-15 10:46:21 +03:00
Dmitriy Kuzmenko
956467e999 add view count to news serializer 2019-11-15 00:26:14 +03:00
d.kuzmenko
c644cbfd64 Merge branch 'feature/transfer-page-counters' into 'develop'
Add rating.views_count transfer

See merge request gm/gm-backend!134
2019-11-14 21:09:26 +00:00
littlewolf
726610d147 Update to onetoone
Update rating annotation
Add migrations
2019-11-14 23:44:49 +03:00
littlewolf
4e72487558 Add rating.views_count transfer 2019-11-14 20:54:14 +03:00
Kuroshini
843230b641 Filters for news favorites 2019-11-14 20:02:09 +03:00
alex
322af9efef fix news in_fav 2019-11-14 17:07:31 +03:00
alex
906ca921f5 in_favorites news 2019-11-13 19:33:09 +03:00
Kuroshini
ebf31f8492 Order news in search results 2019-11-13 17:11:47 +03:00
Anatoly
8cf50ff2cd added endpoints for back office and refactored a little 2019-11-13 12:07:02 +03:00
Semyon Yekhmenin
fe6f9953d8 Added mobile news endpoints 2019-11-12 13:12:10 +00:00
Kuroshini
d3ab910fba Filter recipes news 2019-11-12 15:10:50 +03:00
alex
0b157244e0 Merge remote-tracking branch 'origin/feature/favorite-news' into develop 2019-11-12 08:51:55 +03:00
Dmitriy Kuzmenko
ec96c32453 fix product type 2019-11-12 02:28:33 +03:00
alex
d853960d2e create, delete, get favorite news 2019-11-05 17:52:36 +03:00
evgeniy-st
83bab7f383 remove hardcoded news 2019-11-05 15:59:28 +03:00
Dmitriy Kuzmenko
c5e96a7ad8 fix retrieve 2019-11-04 20:33:35 +03:00
Kuroshini
9d087b53ee Hardcode for presentation 2019-11-04 18:18:46 +03:00
Kuroshini
4dd06f772f Use old ids for demonstration 2019-11-04 15:30:59 +03:00
Dmitriy Kuzmenko
55c24c400b change news tag command 2019-11-04 11:49:57 +03:00
Dmitriy Kuzmenko
888e18b9b1 change news tag command 2019-11-04 11:35:13 +03:00
Dmitriy Kuzmenko
b37b634f59 change news tag command 2019-11-04 11:09:15 +03:00
Dmitriy Kuzmenko
8e61071759 add news tag command 2019-11-03 20:33:45 +03:00
Anatoly
4f89d7603e change translation mechanics 2019-11-03 17:00:47 +03:00
Anatoly
10fb4ee0dd small fix 2019-11-03 01:40:45 +03:00
Anatoly
201dd40193 fixed related news, but in future need refactoring 2019-11-03 01:32:46 +03:00
Anatoly
c14ab722a1 change field parameter in model Guide (gm-241) 2019-11-03 00:25:03 +03:00
alex
7e503f617e merge migrations 2019-10-30 20:15:19 +03:00
alex
962d24f737 Merge branch 'migration_fix' into develop
# Conflicts:
#	apps/establishment/admin.py
#	apps/transfer/models.py
2019-10-30 20:04:02 +03:00