Merge pull request #220 from bcgov/develop

PR to merge develop to master. The PR belongs to release-v0.1.0
bcgov · Apr 17, 2018 · 51d4b9b · 51d4b9b
2 parents fb03373 + 12969f6
commit 51d4b9b
Show file tree

Hide file tree

Showing 210 changed files with 134 additions and 53,756 deletions.
diff --git a/backend/api/viewsets/CreditTrade.py b/backend/api/viewsets/CreditTrade.py
@@ -124,4 +124,6 @@ def batch_process(self, request):
             credit_trade.update_user_id = request.user.id
             CreditTradeService.approve(credit_trade)
 
-        return Response(None, status=status.HTTP_200_OK)
+        return Response({"message":
+                         "Approved Credit Transfers have been processed."},
+                        status=status.HTTP_200_OK)
diff --git a/book.json b/book.json
diff --git a/docs/GLOSSARY.md b/docs/GLOSSARY.md
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
diff --git a/docs/features/alerts.md b/docs/features/alerts.md
diff --git a/docs/features/controls.md b/docs/features/controls.md
diff --git a/docs/features/credit_balance_changes.md b/docs/features/credit_balance_changes.md
diff --git a/docs/features/historical_data_entry.md b/docs/features/historical_data_entry.md
diff --git a/docs/features/roles_and_permissions.md b/docs/features/roles_and_permissions.md
diff --git a/docs/features/tfrs_admin_role.md b/docs/features/tfrs_admin_role.md