Commit Graph

98 Commits

Author SHA1 Message Date
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
Виктор Гладких
b42e9781a1 Fix code 2019-10-04 10:20:36 +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
Виктор Гладких
38be14b5ba Merge branch 'develop' into feature/news-rating 2019-10-03 11:39:24 +03:00
Виктор Гладких
f90e1ceded Add raiting 2019-10-03 11:37:59 +03:00
Виктор Гладких
f0001eef93 Add get method in view 2019-10-02 17:58:22 +03:00
d.kuzmenko
750f141017 Merge branch 'feature/sending-news-email' into 'develop'
Feature/sending news email

See merge request gm/gm-backend!45
2019-10-02 14:17:29 +00:00
evgeniy-st
ca9475b182 refactor this feature 2019-10-02 12:35:01 +03:00
michail
5ec81f417a fix bug 2019-10-02 13:37:46 +05:00
michail
393ecbb55c Merge remote-tracking branch 'origin/feature/sending-news-email' into feature/sending-news-email
# Conflicts:
#	apps/news/admin.py
#	apps/news/tasks.py
2019-10-02 13:31:29 +05:00
michail
fb9e71cbdd fix querysets 2019-10-02 13:27:33 +05:00
Виктор Гладких
e611e3154d Push 2019-10-02 11:21:28 +03:00
evgeniy-st
8f66f5372d Merge branch 'develop' into feature/will-also-like-news 2019-10-02 10:45:16 +03:00
michail
02638a26fe added sending through celery 2019-10-02 12:09:45 +05:00
michail
c0149a0695 added country_code to news email template 2019-10-02 11:48:03 +05:00
michail
c28d1cf3a0 fix locale and country code in task 2019-10-02 11:48:03 +05:00
michail
5474c2ff69 added news mail template and task without celery delay 2019-10-02 11:48:03 +05:00
michail
6683d4a4ef First commit 2019-10-02 11:48:03 +05:00
Виктор Гладких
266ace6912 Merge branch 'develop' into feature/sending-news-email 2019-10-01 17:52:28 +03:00
Виктор Гладких
0c79548027 Fix 2019-10-01 17:51:27 +03:00
Виктор Гладких
1f85f63d20 Fix celery 2019-10-01 17:45:57 +03:00
Виктор Гладких
ee221d0938 Fix celery 2019-10-01 17:33:21 +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
michail
88df92a7a5 added country_code to news email template 2019-09-30 12:42:49 +05:00
michail
6d72c1abfd fix locale and country code in task 2019-09-30 12:18:18 +05:00
michail
90ae87a14e added news mail template and task without celery delay 2019-09-30 12:09:53 +05:00
Kuroshini
ac8356c7d1 Fix some test && routes && add migration 2019-09-27 19:03:30 +03:00
Виктор Гладких
4f3c804251 Fix 2019-09-27 17:34:13 +03: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
michail
755490c6cf done 2019-09-27 17:12:24 +05:00
evgeniy-st
46ce25f0f7 fix migration 2019-09-27 12:21:50 +03:00
evgeniy-st
cd951ddd75 remove custom slug field from serializer, small fix in migration 2019-09-27 11:57:42 +03: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
michail
b1b9ab5ab2 First commit 2019-09-27 11:14:18 +05:00
michail
cf19904349 Fixed urls and tests for news 2019-09-25 13:17:24 +05:00
Kuroshini
ecdf2fcaa0 Change slugs and str url order 2019-09-24 16:45:36 +03:00
Kuroshini
1534c9b09c Remove unique
(cherry picked from commit f793c20)
2019-09-24 14:51:51 +03:00
Kuroshini
f49ea12108 Remove unnecessary field 2019-09-24 12:39:08 +03:00
Kuroshini
0b5e40640c Remove test url 2019-09-24 12:36:52 +03:00