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
..
api	Merge remote-tracking branch 'origin/master' into feature/reference_files	2020-03-20 11:07:55 -04:00
models	Merge remote-tracking branch 'origin/master' into feature/reference_files	2020-03-20 11:07:55 -04:00
scripts	Found a few errors in the sqlalchemy file definition that was causing failures, and had some consistency problems with the IRB Categories file name. The API was bailing out because we had restricted file types to bpmn,svg,or dmn in the connexion config file, I don't restrict this anymore we have plenty of checks elsewhere. Adding xlrd as a dependency - this didn't fail till a push to production.	2020-03-20 08:21:21 -04:00
services	Merge remote-tracking branch 'origin/master' into feature/reference_files	2020-03-20 11:07:55 -04:00
static	Assure that reference file exists on data-reload.	2020-03-20 07:41:21 -04:00
__init__.py	Silences SQLALCHEMY_TRACK_MODIFICATIONS warning	2020-03-16 13:47:17 -04:00
api.yml	Merge remote-tracking branch 'origin/master' into feature/reference_files	2020-03-20 11:07:55 -04:00