Commit Graph

20 Commits

Author SHA1 Message Date
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
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
Dmitriy Kuzmenko
411bef5272 change admin for news 2019-10-29 10:30:08 +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
9d4c483f51 clean models (tags) 2019-10-15 18:25:09 +03:00
Anatoly
4796fce784 Merge branch 'develop' into feature/gm-148
# Conflicts:
#	apps/news/admin.py
2019-10-02 18:11:47 +03: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
michail
02638a26fe added sending through celery 2019-10-02 12:09:45 +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
Виктор Гладких
1f85f63d20 Fix celery 2019-10-01 17:45:57 +03:00
Виктор Гладких
ee221d0938 Fix celery 2019-10-01 17:33:21 +03:00
Anatoly
501b8833ed gm-148: finish 2019-09-30 15:40:28 +03:00
michail
90ae87a14e added news mail template and task without celery delay 2019-09-30 12:09:53 +05:00
michail
b1b9ab5ab2 First commit 2019-09-27 11:14:18 +05:00
Dmitriy Kuzmenko
4deb68b4e9 version 0.0.19: Add NewsType list admin changes 2019-08-16 15:35:32 +03:00
Dmitriy Kuzmenko
68f6e0bc9c version 0.0.6 new models and api for News 2019-08-13 15:23:00 +03:00