Sam 7e7552742a conflict resolution

2021-02-09 12:06:28 +00:00

..

management/commands

update to requirements, fix dataset file location in management command

2021-02-02 11:51:00 +00:00

migrations

created basic apps

2021-01-21 10:10:50 +00:00

__init__.py

created basic apps

2021-01-21 10:10:50 +00:00

admin.py

reenabled django suit

2021-02-02 12:21:42 +00:00

apps.py

created basic apps

2021-01-21 10:10:50 +00:00

factories.py

added default roles to user: shop_user, coop_manager

2021-02-02 12:51:51 +00:00

models.py

undid regressions from code merge with diego

2021-02-04 13:19:43 +00:00

serializers.py

enabled custom serializers in my_ endpoints

2021-02-09 12:04:47 +00:00

tests.py

email verification sent for users loaded thru CSV

2021-02-05 13:11:09 +00:00

utils.py

email verification sent for users loaded thru CSV

2021-02-05 13:11:09 +00:00

views.py

conflict resolution

2021-02-09 12:06:28 +00:00