Dan Funk b35427523d Merge remote-tracking branch 'origin/master' into feature/reference_files ... # Conflicts: # crc/models/file.py # crc/services/file_service.py # tests/data/reference/irb_documents.xlsx # tests/test_files_api.py		2020-03-20 11:07:55 -04:00
..
__init__.py	Refactor models into seperate directories	2019-12-31 16:32:47 -05:00
api_models.py	Revert "Merge remote-tracking branch 'origin/feature/reference_files' into feature/workflow_spec_categories"	2020-03-18 17:05:13 -04:00
file.py	Merge remote-tracking branch 'origin/master' into feature/reference_files	2020-03-20 11:07:55 -04:00
protocol_builder.py	Removing the doc_types from the protocol builder, as these will eventually contradict what is coming from IRB and should not be used as an reference. Also fixing a failing test and assuring that only one reference file ever exists with a given name.	2020-03-19 10:40:07 -04:00
stats.py	Resolves marshmallow_sqlalchemy.ModelSchema deprecation warning	2020-03-16 13:37:31 -04:00
study.py	Resolves marshmallow_sqlalchemy.ModelSchema deprecation warning	2020-03-16 13:37:31 -04:00
user.py	Resolves marshmallow_sqlalchemy.ModelSchema deprecation warning	2020-03-16 13:37:31 -04:00
workflow.py	Fixing failed tests, setting unknown=EXCLUDE on the workflow spec model schema so that it can handle getting back the dump-only workflow_spec_category and just ignore it.	2020-03-20 07:54:01 -04:00