Commit Graph

56 Commits

Author SHA1 Message Date
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
Anatoly
81cdaa5c89 added image_url & preview_image_url to NewsDocument 2019-10-24 19:53:09 +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
Anatoly
7dbf594809 Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/account/tasks.py
2019-10-23 15:54:21 +03:00
Anatoly
6a9f11e989 merge from develop 2019-10-23 15:31:04 +03:00
evgeniy-st
64692ae4b3 max length of slug is 255 2019-10-23 12:03:50 +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
d1c9e649b7 Remove metadatacontent 2019-10-22 17:05:54 +03:00
Semyon Yekhmenin
afc2127646 Updated news model with agenda and banner 2019-10-21 14:45:34 +00:00
evgeniy-st
074a5ec5ea refactor news tags 2019-10-09 18:25:40 +03:00
Anatoly
90ab1a2ab9 Revert "fix migrations"
This reverts commit 9a36b52e
2019-10-04 18:02:51 +03:00
Anatoly
9a36b52eec fix migrations 2019-10-04 15:26:29 +03:00
Anatoly
eaa1795f0c Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/authorization/tasks.py
2019-10-04 14:00:06 +03:00
evgeniy-st
9fb05f0407 Merge branch 'feature/es' into develop 2019-10-04 12:11:12 +03:00
evgeniy-st
50a9622f78 News search 2019-10-04 12:05:13 +03:00
Anatoly
646eeb8972 Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/news/models.py
2019-10-04 11:53:31 +03:00
Anatoly
4890e00b95 gm-148: refactored 2019-10-04 11:50:29 +03:00
Виктор Гладких
9fd064fdec Add rating unique value 2019-10-03 14:51:17 +03:00
Виктор Гладких
14cf7d7b1b Add rating value in news 2019-10-03 14:46:34 +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
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
Kuroshini
ac8356c7d1 Fix some test && routes && add migration 2019-09-27 19:03:30 +03:00
Виктор Гладких
49ab0a5843 Fix conflict 2019-09-27 17:31:33 +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
michail
755490c6cf done 2019-09-27 17:12:24 +05:00
evgeniy-st
c9bf83fba7 News slug, disable null, remove editable 2019-09-27 11:53:40 +03:00
michail
962dc2f480 maybe it is solution 2019-09-27 12:01:30 +05:00
michail
9608fdb92a property was added to news model 2019-09-27 11:30:58 +05:00
Kuroshini
f49ea12108 Remove unnecessary field 2019-09-24 12:39:08 +03:00
Kuroshini
6420a676df create slugs manually 2019-09-24 10:38:04 +03:00
Kuroshini
1ce71fdcdc slugs for news & establishments 2019-09-24 10:38:04 +03:00
evgeniy-st
b4320ab4a6 End of news may be None 2019-09-23 17:17:42 +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
evgeniy-st
99011ba15a Initial search indexes app 2019-09-06 14:52:52 +03:00
evgeniy-st
a2ef5bbfd5 small refactor 2019-09-02 12:00:19 +03:00
Dmitriy Kuzmenko
fc4facbf83 add contacts for establishments 2019-09-01 12:35:09 +03:00
Dmitriy Kuzmenko
9a7052026b add metadata 2019-08-29 14:51:55 +03:00
evgeniy-st
e3ad562680 update news model 2019-08-28 18:30:35 +03:00
Dmitriy Kuzmenko
262e98b9e1 add awards 2019-08-28 10:15:17 +03:00
Anatoly
2172972216 refactored gallery app 2019-08-27 18:58:40 +03:00
Anatoly
ce260a69aa Revert "added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections"
This reverts commit 07333234
2019-08-27 18:18:58 +03:00
Anatoly
0733323486 added collection gallery; create migrations for models - collection, gallery, news; fixed models - news, collections 2019-08-27 17:15:09 +03:00