Dan Funk c7d8eaff30 Merge branch 'dev' into feature/refactor_data_loading		2020-06-16 13:15:43 -04:00
..
api	Merge branch 'dev' into feature/refactor_data_loading	2020-06-16 13:15:43 -04:00
models	Merge branch 'dev' into feature/refactor_data_loading	2020-06-16 13:15:43 -04:00
scripts	Adding some additional logic to the approval endpoint so that we take related approvals into account when setting the status. In addtion to prevous status options, there is a new status of "AWAITING" which means there are pending approvals before this approval that still need to be approved or canceled.	2020-06-05 14:33:00 -04:00
services	Merge branch 'dev' into feature/refactor_data_loading	2020-06-16 13:15:43 -04:00
static	Merging production back into dev, because we got out of whack somehow.	2020-06-08 14:19:30 -04:00
__init__.py	Merge branch 'rrt/dev' into feature/swagger_admin_authentication	2020-06-11 08:55:29 -04:00
api.yml	Fixes broken unit tests. But still broken.	2020-06-11 11:29:58 -04:00