Anatoly 25c63b8097 Merge branch 'develop' into feature/roles ... # Conflicts: # apps/account/models.py # apps/collection/views/back.py # apps/comment/views/back.py # apps/establishment/models.py # apps/establishment/views/back.py # apps/news/views.py # apps/partner/views/back.py		2020-01-30 10:56:46 +03:00
..
management	optimize fix	2020-01-20 10:25:09 +00:00
migrations	see changes	2019-12-26 10:24:08 +03:00
serializers	added filter - establishment_id, refactored guide counters	2020-01-28 17:52:49 +03:00
urls	add export for guides	2019-12-26 18:11:48 +03:00
views	Merge branch 'develop' into feature/roles	2020-01-30 10:56:46 +03:00
__init__.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
admin.py	refactored method to get similar list on entities (see todo: establishment/models.py)	2019-12-23 17:53:48 +03:00
apps.py	added app collection, added new models	2019-08-21 09:58:45 +03:00
filters.py	added filter - establishment_id, refactored guide counters	2020-01-28 17:52:49 +03:00
models.py	added filter - establishment_id, refactored guide counters	2020-01-28 17:52:49 +03:00
tasks.py	small changes	2020-01-09 14:59:29 +03:00
transfer_data.py	fix transfer	2019-12-20 09:26:45 +03:00