Commit Graph

49 Commits

Author SHA1 Message Date
Anatoly
a8b3c9aa63 refactored galleries, added transfer script 2019-11-17 14:22:30 +03:00
alex
71dd52c194 news in_favs nested fix 2019-11-15 15:28:27 +03:00
Dmitriy Kuzmenko
956467e999 add view count to news serializer 2019-11-15 00:26:14 +03:00
alex
906ca921f5 in_favorites news 2019-11-13 19:33:09 +03:00
Anatoly
8cf50ff2cd added endpoints for back office and refactored a little 2019-11-13 12:07:02 +03:00
alex
d853960d2e create, delete, get favorite news 2019-11-05 17:52:36 +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
414ad72ed3 Revert "modified NewsImageSerializer, in future needs refactoring"
This reverts commit 776b500d
2019-10-30 20:01:19 +03:00
Anatoly
776b500d19 modified NewsImageSerializer, in future needs refactoring 2019-10-30 19:59:12 +03: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
d4fe5ebd2d search by type & subtype 2019-10-25 16:06:52 +03:00
Anatoly
84fb0aec70 change field parameter in model Guide (gm-241) 2019-10-24 16:42:08 +03:00
evgeniy-st
636bc43a35 remove playlist from news model 2019-10-24 12:38:44 +03:00
evgeniy-st
6c4f1a2e40 Fix news serializer 2019-10-24 12:08:44 +03:00
evgeniy-st
0edc2fae38 Clean news serializer 2019-10-24 12:03:41 +03:00
Anatoly
a8001c44b1 added validation rule to NewsBackOfficeGallerySerializer 2019-10-23 17:50:08 +03:00
Anatoly
fd2c1e0ca6 Merge remote-tracking branch 'origin/feature/gm-148' into feature/gm-148
# Conflicts:
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
#	project/settings/production.py
2019-10-23 15:37:14 +03:00
Anatoly
6a9f11e989 merge from develop 2019-10-23 15:31:04 +03:00
Anatoly
90e53d738d Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/main/models.py
#	apps/news/admin.py
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
#	project/settings/base.py
#	project/settings/production.py
#	requirements/base.txt
2019-10-23 12:00:58 +03:00
evgeniy-st
6c195bc185 Merge branch 'develop' into feature/gm-148 2019-10-21 20:26:31 +03:00
d.kuzmenko
18a2517fde Merge branch 'feature/GM-176_standard_user' into 'develop'
Feature/gm 176 standard user

See merge request gm/gm-backend!54
2019-10-21 14:50:47 +00:00
Semyon Yekhmenin
afc2127646 Updated news model with agenda and banner 2019-10-21 14:45:34 +00:00
Виктор Гладких
264e7bcb2a Fix conflict 2019-10-21 14:43:14 +03:00
Виктор Гладких
019c22a0c8 Fix test 2019-10-21 14:39:04 +03:00
Anatoly
2d830b2821 Merge branch 'feature/gm-192' into feature/gm-148
# Conflicts:
#	apps/news/models.py
#	apps/news/serializers.py
#	apps/news/views.py
2019-10-15 12:08:23 +03:00
evgeniy-st
074a5ec5ea refactor news tags 2019-10-09 18:25:40 +03:00
Anatoly
8ac5a1970f fixed carousel 2019-10-07 10:51:08 +03:00
Anatoly
4890e00b95 gm-148: refactored 2019-10-04 11:50:29 +03:00
Anatoly
e66b2f7f9f refactored 2019-10-02 16:13:21 +03:00
evgeniy-st
ca9475b182 refactor this feature 2019-10-02 12:35:01 +03:00
evgeniy-st
8f66f5372d Merge branch 'develop' into feature/will-also-like-news 2019-10-02 10:45:16 +03:00
michail
a497230883 fix names of methods and fields of serializer 2019-10-01 17:42:14 +05:00
evgeniy-st
051957c7cf Refactor JSON Validation 2019-10-01 13:03:59 +03:00
michail
055e99dba2 added "on the same theme" news list and "you should read" news list 2019-09-30 13:17:38 +05:00
d.kuzmenko
b724e2eeb9 Merge branch 'feature/will-also-like-news' into 'develop'
Feature/will also like news

See merge request gm/gm-backend!34
2019-09-30 07:58:49 +00:00
Виктор Гладких
49ab0a5843 Fix conflict 2019-09-27 17:31:33 +03:00
Виктор Гладких
d25e4af488 Created by 2019-09-27 17:21:57 +03:00
evgeniy-st
03753f9059 News model, state 2019-09-27 17:16:40 +03:00
Виктор Гладких
ae87a51277 Author 2019-09-27 17:10:08 +03:00
evgeniy-st
785d2a2f09 update news serializer, RUD for backoffice 2019-09-27 16:56:26 +03:00
evgeniy-st
cd951ddd75 remove custom slug field from serializer, small fix in migration 2019-09-27 11:57:42 +03:00
michail
9608fdb92a property was added to news model 2019-09-27 11:30:58 +05:00
Kuroshini
1534c9b09c Remove unique
(cherry picked from commit f793c20)
2019-09-24 14:51:51 +03:00
Kuroshini
65914659e5 Slugs serializers 2019-09-24 12:31:35 +03:00
evgeniy-st
fd265a397b Update NewsBaseSerializer 2019-09-23 16:53:33 +03:00
evgeniy-st
009533d764 Tags & disable elasticsearch indexing 2019-09-23 16:06:40 +03:00
evgeniy-st
dc4b63d8b2 Refactor news 2019-09-23 15:35:37 +03:00