Merge branch 'release/2.1'

SURFnet · Jul 17, 2019 · 54dce26 · 54dce26
2 parents 3b1f805 + ed109f7
commit 54dce26
Show file tree

Hide file tree

Showing 25 changed files with 1,201 additions and 454 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.1.6
+**Bugfix**
+  * Escape the wysiwyg translations #281
+  * Fix the statuscode for switch to nonexistent service #280
+  * Add additional secyurity headers to response #278
+  * Fix the entity delete acl #276
+  * Fix the translations acl #277
+
 ## 2.1.5
 **Bugfix**
  * Ensure the issues are indexed on Manage id #273

diff --git a/ansible/group_vars/override.yml b/ansible/group_vars/override.yml
@@ -36,3 +36,4 @@ mongo:
   manage_password: "{{ mongo_passwords.manage }}"
   manage_database: manage
 
+manage_show_oidc_rp_tab: True
diff --git a/ansible/roles/manage-server-prod/defaults/main.yml b/ansible/roles/manage-server-prod/defaults/main.yml
@@ -9,3 +9,5 @@ manage_disclaimer_background_color: skyblue
 manage_disclaimer_content: OC
 manage_service_provider_feed_url: "http://mds.edugain.org/"
 manage_exclude_edugain_imports_in_push: true
+manage_show_oidc_rp_tab: true
+manage_exclude_oidc_rp_imports_in_push: false