Merge branch 'master' into ui/reports-spend-table

2018-08-23 08:26:41 -04:00
parent 3c20053268 70cc82a1e7
commit 08783e60ce
66 changed files with 1160 additions and 362 deletions
--- a/templates/workspace_reports.html
+++ b/templates/workspace_reports.html
@@ -5,7 +5,7 @@

 {% block workspace_content %}

-  {{ Alert("Funding Information & Reports for Workspace " + workspace_id,
+  {{ Alert("Funding Information & Reports for Workspace " + workspace.name,
    message="<p>On this screen you'll find detailed reporting information on this workspace. This message needs to be written better and be dismissable.</p>",
    actions=[
      {"label": "Learn More", "href": "/", "icon": "info"},