Anatoly 4796fce784 Merge branch 'develop' into feature/gm-148 ... # Conflicts: # apps/news/admin.py		2019-10-02 18:11:47 +03:00
..
account	Merge branch 'develop' into feature/gm-148	2019-10-02 15:46:35 +03:00
advertisement	fixed migration for app advertisement, added choice to PlatformMixin	2019-09-19 16:46:33 +03:00
authorization	Merge branch 'develop' into feature/gm-148	2019-10-02 18:11:47 +03:00
collection	refactored collection views	2019-10-02 16:21:38 +03:00
comment	replace ImageFields to URLFields in User model, refactored serializers that included this fields	2019-09-12 18:10:52 +03:00
configuration	add configuration	2019-08-28 17:53:52 +03:00
establishment	Merge branch 'develop' into feature/gm-148	2019-10-02 10:20:14 +03:00
favorites	refactor address	2019-10-01 18:07:04 +03:00
gallery	added migration	2019-10-02 18:09:29 +03:00
location	refactor address	2019-10-01 18:07:04 +03:00
main	Review fixes	2019-09-30 16:40:46 +03:00
news	Merge branch 'develop' into feature/gm-148	2019-10-02 18:11:47 +03:00
notification	added news mail template and task without celery delay	2019-10-02 11:48:03 +05:00
partner	Add partner tests	2019-09-22 15:37:51 +05:00
products	add awards	2019-08-28 10:15:17 +03:00
recipe	Add recipe tests	2019-09-23 16:21:48 +05:00
review	GM-127: in progress	2019-09-25 19:39:37 +03:00
search_indexes	Fix import package issue	2019-09-30 12:46:58 +03:00
timetable	gm-148: modified settings, added missing migration	2019-10-02 10:34:17 +03:00
translation	change contacts for est.	2019-09-01 13:39:01 +03:00
utils	Merge branch 'develop' into feature/gm-148	2019-10-02 18:11:47 +03:00
__init__.py	version 0.0.1: add project, model user and api	2019-08-07 16:10:23 +03:00