Merged in patches from production.

- Legacy-Id: 8473

ietf/doc/views_doc.py

@@ -862,7 +862,7 @@ def telechat_date(request, name):
     initial_returning_item = bool(e and e.returning_item)
 
     prompts = []
-    if e and doc.type.slug != 'charter':
+    if e and e.telechat_date and doc.type.slug != 'charter':
         if e.telechat_date==datetime.date.today():
             prompts.append( "This document is currently scheduled for today's telechat. "
                            +"Please set the returning item bit carefully.")

ietf/settings.py

@@ -477,4 +477,4 @@ if SERVER_MODE != 'production':
     if 'SECRET_KEY' not in locals():
         SECRET_KEY = 'PDwXboUq!=hPjnrtG2=ge#N$Dwy+wn@uivrugwpic8mxyPfHka'
 
-X_FRAME_OPTIONS = "ALLOW-FROM tools.ietf.org"
+# X_FRAME_OPTIONS = "ALLOW-FROM tools.ietf.org"