From b571983ebe666c6bcc9e0c652b0cddde3a8c7f9d Mon Sep 17 00:00:00 2001
From: Stephen Dolenc <sdolenc@users.noreply.github.com>
Date: Tue, 26 Sep 2017 20:51:15 -0700
Subject: [PATCH 1/6] Revert "This change will add the ability to look in to
 list of organizations for a single Site" (#127)

---
 comprehensive/lms/templates/courseware/course_about.html | 2 +-
 comprehensive/lms/templates/courseware/courseware.html   | 2 +-
 comprehensive/lms/templates/courseware/info.html         | 2 +-
 courses/lms/templates/courseware/course_about.html       | 2 +-
 courses/lms/templates/courseware/courseware.html         | 2 +-
 courses/lms/templates/courseware/info.html               | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/comprehensive/lms/templates/courseware/course_about.html b/comprehensive/lms/templates/courseware/course_about.html
index 31404f8..af66cb9 100644
--- a/comprehensive/lms/templates/courseware/course_about.html
+++ b/comprehensive/lms/templates/courseware/course_about.html
@@ -12,7 +12,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter:
+% if my_course_org_filter == course.display_org_with_default:
 <%block name="headextra">
   ## OG (Open Graph) title and description added below to give social media info to display
   ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
diff --git a/comprehensive/lms/templates/courseware/courseware.html b/comprehensive/lms/templates/courseware/courseware.html
index d5d4cbf..8ff0698 100644
--- a/comprehensive/lms/templates/courseware/courseware.html
+++ b/comprehensive/lms/templates/courseware/courseware.html
@@ -14,7 +14,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter:
+% if my_course_org_filter == course.display_org_with_default:
 <%
   include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams)
 %>
diff --git a/comprehensive/lms/templates/courseware/info.html b/comprehensive/lms/templates/courseware/info.html
index 5508f93..1ba6b3d 100644
--- a/comprehensive/lms/templates/courseware/info.html
+++ b/comprehensive/lms/templates/courseware/info.html
@@ -16,7 +16,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter:
+% if my_course_org_filter == course.display_org_with_default:
 <%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
 
 <%block name="headextra">
diff --git a/courses/lms/templates/courseware/course_about.html b/courses/lms/templates/courseware/course_about.html
index 72e0720..978f1c0 100644
--- a/courses/lms/templates/courseware/course_about.html
+++ b/courses/lms/templates/courseware/course_about.html
@@ -12,7 +12,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
+% if my_course_org_filter == course.display_org_with_default and user.is_authenticated():
 <%block name="headextra">
   ## OG (Open Graph) title and description added below to give social media info to display
   ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
diff --git a/courses/lms/templates/courseware/courseware.html b/courses/lms/templates/courseware/courseware.html
index 4632d56..600caf1 100644
--- a/courses/lms/templates/courseware/courseware.html
+++ b/courses/lms/templates/courseware/courseware.html
@@ -14,7 +14,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
+% if my_course_org_filter == course.display_org_with_default:
 <%
   include_special_exams = settings.FEATURES.get('ENABLE_SPECIAL_EXAMS', False) and (course.enable_proctored_exams or course.enable_timed_exams)
 %>
diff --git a/courses/lms/templates/courseware/info.html b/courses/lms/templates/courseware/info.html
index 1e35649..f17b359 100644
--- a/courses/lms/templates/courseware/info.html
+++ b/courses/lms/templates/courseware/info.html
@@ -16,7 +16,7 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 <%
    my_course_org_filter = configuration_helpers.get_value('course_org_filter')
 %>
-% if course.display_org_with_default in my_course_org_filter and user.is_authenticated():
+% if my_course_org_filter == course.display_org_with_default and user.is_authenticated():
 <%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
 
 <%block name="headextra">

From 20149cb202203a711315f7b9d93c72078f3a7b56 Mon Sep 17 00:00:00 2001
From: localstepdo <stepdo@microsoft.com>
Date: Thu, 28 Sep 2017 14:34:42 -0700
Subject: [PATCH 2/6] fix next query param for courses site

---
 courses/lms/templates/login.html    | 2 +-
 courses/lms/templates/register.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/courses/lms/templates/login.html b/courses/lms/templates/login.html
index e264ca6..aee7fb4 100644
--- a/courses/lms/templates/login.html
+++ b/courses/lms/templates/login.html
@@ -64,7 +64,7 @@ from third_party_auth import provider, pipeline
 
       $('#login-form').on('ajax:success', function(event, json, xhr) {
         if(json.success) {
-          var nextUrl = "${login_redirect_url}";
+          var nextUrl = "${login_redirect_url | u}";
           if (json.redirect_url) {
             nextUrl = json.redirect_url; // Most likely third party auth completion. This trumps 'nextUrl' above.
           }
diff --git a/courses/lms/templates/register.html b/courses/lms/templates/register.html
index b6a0b84..e15e5e2 100644
--- a/courses/lms/templates/register.html
+++ b/courses/lms/templates/register.html
@@ -52,7 +52,7 @@ import calendar
       });
 
       $('#register-form').on('ajax:success', function(event, json, xhr) {
-        var nextUrl = "${login_redirect_url}";
+        var nextUrl = "${login_redirect_url | u}";
         if (json.redirect_url) {
           nextUrl = json.redirect_url; // Most likely third party auth completion. This trumps 'nextUrl' above.
         }

From 8ece0177194834c8f9cb716f3a0ee2269af6e42b Mon Sep 17 00:00:00 2001
From: Kevser Sunercan <kevsers@microsoft.com>
Date: Wed, 4 Oct 2017 11:52:00 -0700
Subject: [PATCH 3/6] unconsent privacy links (#130)

---
 comprehensive/lms/templates/footer.html              |  6 +++---
 comprehensive/lms/templates/register-form.html       |  6 +++---
 .../lms/templates/static_templates/tos.html          | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/comprehensive/lms/templates/footer.html b/comprehensive/lms/templates/footer.html
index a119884..68d592b 100644
--- a/comprehensive/lms/templates/footer.html
+++ b/comprehensive/lms/templates/footer.html
@@ -18,9 +18,9 @@
 			<li>
 				&copy; ${_(' {year} Microsoft').format( year=date.today().year)}
 			</li>
-			<li><a href="https://www.microsoft.com/en-us/privacystatement/default.aspx" target="_blank">Privacy & Cookies</a></li>
-			<li><a href="${reverse('tos')}" target="_blank">Terms of Service</a></li>
-			<li><a href="https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/en-us.aspx" target="_blank">Trademarks</a></li>
+			<li><a href="https://www.microsoft.com/en-us/privacystatement/default.aspx" target="_blank" data-mscc-ic="false">Privacy & Cookies</a></li>
+			<li><a href="${reverse('tos')}" target="_blank" data-mscc-ic="false">Terms of Service</a></li>
+			<li><a href="https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/en-us.aspx" target="_blank" data-mscc-ic="false">Trademarks</a></li>
 			<li><a href="/faq" target="_blank">Support</a></li>
         </ol>      
      </nav>
diff --git a/comprehensive/lms/templates/register-form.html b/comprehensive/lms/templates/register-form.html
index 335a013..5e12f1a 100644
--- a/comprehensive/lms/templates/register-form.html
+++ b/comprehensive/lms/templates/register-form.html
@@ -258,7 +258,7 @@ from student.models import UserProfile
       <div class="field required checkbox" id="field-tos">
         <input id="tos-yes" type="checkbox" name="terms_of_service" value="true" required aria-required="true" />
         <label for="tos-yes">${_('I agree to the {link_start}Terms of Service{link_end}').format(
-          link_start='<a href="{url}" class="new-vp" tabindex="-1">'.format(url=marketing_link('TOS')),
+          link_start='<a href="{url}" data-mscc-ic="false" class="new-vp" tabindex="-1">'.format(url=marketing_link('TOS')),
           link_end='</a>')}</label>
       </div>
       % endif
@@ -273,14 +273,14 @@ from student.models import UserProfile
           honor_code_path = marketing_link('DN')
         %>
         <label for="honorcode-yes">${_('I agree to the {link_start}Disclosure Notice{link_end}').format(
-          link_start='<a href="{url}" class="new-vp" tabindex="-1">'.format(url=honor_code_path),
+          link_start='<a href="{url}" data-mscc-ic="false" class="new-vp" tabindex="-1">'.format(url=honor_code_path),
           link_end='</a>')}</label>
       </div>
       % endif
       % endif	  
     </li>
 	<li class="field">
- 		<a href="http://go.microsoft.com/fwlink/?LinkId=521839" target="_blank">Privacy Statement</a>
+ 		<a href="http://go.microsoft.com/fwlink/?LinkId=521839" target="_blank" data-mscc-ic="false">Privacy Statement</a>
  	</li>
   </ol>
 </div>
diff --git a/comprehensive/lms/templates/static_templates/tos.html b/comprehensive/lms/templates/static_templates/tos.html
index 141755f..28b0b16 100644
--- a/comprehensive/lms/templates/static_templates/tos.html
+++ b/comprehensive/lms/templates/static_templates/tos.html
@@ -23,7 +23,7 @@
     <p><b>Section 2: Acceptance of the Terms of Service</b></p>
     <p>By accepting these TOS when that option is made available to you, by using the Services or by continuing to use the Services, you agree to abide by the most current version of these TOS without modification by you. If you do not agree, you may not access or use the Services.<br>By creating an account, accepting these TOS, or by using the Services, you represent that you have either reached the age of "majority" where you live or have valid parent or legal guardian consent to be bound by these TOS. If you do not know whether you have reached the age of majority where you live, or do not understand this section, please ask your parent or legal guardian for help before you create an account for this website. If you are the parent or legal guardian of a minor that creates an account for this website, you accept these TOS on the minor’s behalf and are responsible for all use of the account and Services, including purchases, whether the minor’s account is now open or created later.<br>Please note that Microsoft does not provide warranties for the Services. These TOS also limits our liability. These terms are in sections 11 and 12.</p>
     <p><b>Section 3: Privacy and Consent to Share Information</b></p>
-    <p><b>3.1 Information Use and Disclosure by Microsoft.</b> Your privacy is important to Microsoft. As part of the Services, Microsoft may automatically upload, track and record information about your devices, your use of the Services and Services performance. Please read the <a style="font-weight: bold;" href="https://www.microsoft.com/en-us/privacystatement/default.aspx">Microsoft Privacy Statement</a> as it describes the types of data Microsoft collects from you and your devices (“<b>Data</b>”) and how we use and disclose that Data. The privacy statement also describes how Microsoft uses your content, which is your communications with others; postings or feedback submitted by you to Microsoft via the Services; and the files, photos, documents, audio, digital works, and videos that you upload, store or share through the Services ("<b>Your Content</b>"). By using the Services or agreeing to these TOS, you consent to Microsoft’s collection, use and disclosure of Your Content and Data as described in the <a style="font-weight: bold;" href="https://www.microsoft.com/en-us/privacystatement/default.aspx">Microsoft Privacy Statement.</a></p> 
+    <p><b>3.1 Information Use and Disclosure by Microsoft.</b> Your privacy is important to Microsoft. As part of the Services, Microsoft may automatically upload, track and record information about your devices, your use of the Services and Services performance. Please read the <a style="font-weight: bold;" href="https://www.microsoft.com/en-us/privacystatement/default.aspx" data-mscc-ic="false">Microsoft Privacy Statement</a> as it describes the types of data Microsoft collects from you and your devices (“<b>Data</b>”) and how we use and disclose that Data. The privacy statement also describes how Microsoft uses your content, which is your communications with others; postings or feedback submitted by you to Microsoft via the Services; and the files, photos, documents, audio, digital works, and videos that you upload, store or share through the Services ("<b>Your Content</b>"). By using the Services or agreeing to these TOS, you consent to Microsoft’s collection, use and disclosure of Your Content and Data as described in the <a style="font-weight: bold;" href="https://www.microsoft.com/en-us/privacystatement/default.aspx" data-mscc-ic="false">Microsoft Privacy Statement.</a></p> 
     <p><b>3.2 Acknowledgment and Consent by You.</b></p>
     <p>(a) If you use your work email account to open your account for this website, you agree that Microsoft may share your usage Data for any training content and assessments accessed through the Services with your employer and you acknowledge that by agreeing to share this Data, you are allowing your employer to view reports on your usage Data.</p>
     <p>(b) If you are a Microsoft employee and you use your microsoft.com email account to open your account for this website, you agree that Microsoft may share your personal information and usage Data for any training content and assessments accessed through the Services with your management at Microsoft and you acknowledge that by agreeing to share this Data, you are allowing your management at Microsoft to view reports on your usage Data.</p>
@@ -41,7 +41,7 @@
     <p><b>Section 5: Your Content</b></p>
     <p>Many of our Services allow you to store or share Your Content or receive material from others. We don’t claim ownership of Your Content. Your Content remains Your Content and you are responsible for it.</p>
     <p>When you share Your Content with other people, you understand that they may be able to, on a worldwide basis, use, save, record, reproduce, transmit, and display Your Content without compensating you. If you do not want others to have that ability, do not use the Services to share Your Content. You represent and warrant that for the duration of these TOS, you have (and will have) all the rights necessary for Your Content that is uploaded, stored, or shared on or through the Services and that the collection, use, and retention of Your Content will not violate any law or rights of others. Microsoft cannot be held responsible for Your Content or the material others upload, store or share using the Services.</b>
-    <p>To the extent necessary to provide the Services to you and others, to protect you and the Services, and to improve Microsoft products and services, you grant to Microsoft a worldwide and royalty-free intellectual property license to use, make copies of, retain, transmit, reformat, publicly display, and distribute Your Content on the Services. If you publish Your Content in areas of the Service where it is available broadly online without restrictions, Your Content may appear in demonstrations or materials that promote the Service. We do not use what you say in email, chat, video calls or voice mail, or your documents, photos or other personal files to target advertising to you. Our advertising policies are covered in detail in the <a style="font-weight: bold;" href="https://www.microsoft.com/en-us/privacystatement/default.aspx">Microsoft Privacy Statement</a>.</p>
+    <p>To the extent necessary to provide the Services to you and others, to protect you and the Services, and to improve Microsoft products and services, you grant to Microsoft a worldwide and royalty-free intellectual property license to use, make copies of, retain, transmit, reformat, publicly display, and distribute Your Content on the Services. If you publish Your Content in areas of the Service where it is available broadly online without restrictions, Your Content may appear in demonstrations or materials that promote the Service. We do not use what you say in email, chat, video calls or voice mail, or your documents, photos or other personal files to target advertising to you. Our advertising policies are covered in detail in the <a style="font-weight: bold;" href="https://www.microsoft.com/en-us/privacystatement/default.aspx" data-mscc-ic="false">Microsoft Privacy Statement</a>.</p>
     <p><b>Section 6: Use of the Services</b></p>
     <p>When using the Services, you must comply with the terms in these TOS. The Services are solely for your personal and non-commercial use. You may be unable to use the Services outside the country associated with your account. By agreeing to these TOS, you are agreeing that, when using the Services, you will follow these rules:<br><ul><li>You will not misrepresent your identity.</li><li>Do not submit or upload any work or answers that aren't entirely your own.</li><li>Do not provide access to, disclose, copy, distribute, transmit, display, record, post, or publish any assessment questions or answers.</li><li>Do not modify or alter any assessment results or course completion certificates.</li><li>Don’t do anything illegal.</li><li>Don’t violate or infringe another party’s rights, including any copyright, trademark, patent, trade secret, moral, privacy right, personal rights, or any other intellectual property or proprietary right.</li><li>Do not use the Services to harm, stalk, abuse, threaten, or harass another person, organization or Microsoft.</li><li>Do not use the Services to transmit any computer viruses, worms, defects, Trojan horses or other items of a destructive nature.</li><li>Do not: (i) circumvent or bypass any technological protection measures in or relating to the Services or any element thereof, or (ii) disassemble, decompile, hack, decrypt, emulate, exploit, or reverse engineer any software or other element of the Services that is included in or accessible through the Services, except and only to the extent that the applicable copyright law expressly permits doing so.</li><li>Do not use the Services in any manner that could damage, disable, overburden, or impair any Microsoft server, or the network(s) connected to any Microsoft server, or interfere with any other party's use and enjoyment of any Services.</li><li>Don't attempt to gain unauthorized access to the Services or other accounts, computer systems or networks connected to any Microsoft server or to any of the Services, through hacking, password mining or any other means.</li><li>Don't engage in activity that is harmful to you, the Services, or others (e.g., posting terrorist content, communicating hate speech, or advocating violence against others).</li><li>Don't help others break these rules.</li><li>Don’t use the Services to advertise or offer to sell or buy any goods or services.</li><li>Do not violate any code of conduct or other guidelines.</li><li>Do not harvest or otherwise collect information about others, including e-mail addresses.</li><li>Do not use, download or otherwise copy, or provide to a person or entity any directory of users of the Services or other user or usage information or any portion thereof.</li><li>Do not obtain (or try to obtain) any data from the Services, except the data that Microsoft intends to make available to you.</li><li>Don't use the Services to publish, post, upload, distribute, share or disseminate any inappropriate, profane, defamatory, obscene, indecent or unlawful topic, name, material or information.</li><li>Don't engage in activity that is false or misleading (e.g., asking for money under false pretenses, impersonating someone else, manipulating the Services to increase play count, or affect rankings, ratings, or comments).</li></ul><br>If you violate these TOS or if Microsoft suspects fraud or unauthorized or improper use of the Services, we may stop providing Services to you or we may close your website account. We may also block delivery of a communication (like email or instant message) to or from the Services to enforce these TOS or we may remove or refuse to publish your Content for any reason. When investigating alleged violations of these TOS, Microsoft reserves the right to review Your Content to resolve the issue. However, we cannot monitor the entire Services and make no attempt to do so.<br>Microsoft reserves the right to disclose any information as Microsoft deems necessary to satisfy any applicable law, regulation, legal process or governmental request in Microsoft's sole discretion.</p>
     <p><b>Section 7: Rights to Change or Cancel the Services</b></p>
@@ -57,15 +57,15 @@
     <p><b>Section 12: Limitation of Liability</b></p>
     <p>If you have any basis for recovering damages, you agree that your exclusive remedy is to recover from Microsoft or any of its affiliates, resellers, distributors, third-party apps and service providers and vendors for all successful claims only direct damages up to U.S. $5.00. <b>YOU CANNOT RECOVER ANY OTHER DAMAGES OR LOSSES, INCLUDING DIRECT, CONSEQUENTIAL, SPECIAL, INDIRECT, INCIDENTAL, OR PUNITIVE DAMAGES AND LOST PROFITS.</b> These limitations and exclusions apply even if this remedy doesn't fully compensate you for any losses or fails of its essential purpose or if we knew or should have known about the possibility of the damages. To the maximum extent permitted by law, these limitations and exclusions apply to anything related to these TOS or the Services. Some or all of these limitations or exclusions may not apply to you if your state, province, or country doesn't allow the exclusion or limitation of incidental, consequential, or other damages.</p>
     <p><b>Section 13: Copyright Claim Notice and Procedure</b></p>
-    <p>Pursuant to Title 17, United States Code, Section 512(c)(2), notifications of claimed copyright infringement should be sent to the Services provider's designated agent. <b>ALL INQUIRIES NOT RELEVANT TO THE FOLLOWING PROCEDURE WILL NOT RECEIVE A RESPONSE. For details and contact information see <a href="http://www.microsoft.com/info/cpyrtinfrg.aspx">Notice and Procedure for Making Claims of Copyright Infringement.</a></b></p>
+    <p>Pursuant to Title 17, United States Code, Section 512(c)(2), notifications of claimed copyright infringement should be sent to the Services provider's designated agent. <b>ALL INQUIRIES NOT RELEVANT TO THE FOLLOWING PROCEDURE WILL NOT RECEIVE A RESPONSE. For details and contact information see <a href="http://www.microsoft.com/info/cpyrtinfrg.aspx" data-mscc-ic="false">Notice and Procedure for Making Claims of Copyright Infringement.</a></b></p>
     <p><b>Section 14: Third-Party Products and Services</b></p>
     <p>Our Services may allow you to access or acquire products, services, websites, links, content, material, certificates or applications from third parties ("<b>Third-Party Products and Services</b>"). The Third-Party Products and Services may also allow you to store your Content or data with the publisher, provider, or operator of the Third-Party Products and Services. The Third-Party Products and Services may present you with a privacy policy or require you to accept additional terms of use before you can install or use the Third-Party Products or Service. You should review any additional terms and privacy policies before acquiring or using any Third-Party Products and Services. Any additional terms do not modify any of these Terms. You are responsible for your dealings with third parties. Microsoft assumes no responsibility or liability whatsoever for the Third-Party Products and Services. Microsoft does not license any intellectual property to you as part of any Third-Party Products and Services and is not responsible for information or services provided by third parties.</p>
     <p><b>Section 15: Binding Arbitration and Class Action Waiver if you live in the United States.</b></p> 
     <p>We hope we never have a dispute, but if we do, you and we agree to try for 60 days to resolve it informally. If we can’t, you and we agree to <b>binding individual arbitration before the American Arbitration Association ("AAA") under the Federal Arbitration Act ("FAA"), and not to sue in court in front of a judge or jury</b>. Instead, a neutral arbitrator will decide and the arbitrator’s decision will be final except for a limited right of review under the FAA. <b>Class action lawsuits, class-wide arbitrations, private attorney-general actions, and any other proceeding where someone acts in a representative capacity aren’t allowed. Nor is combining individual proceedings without the consent of all parties.</b> "We," "our," and "us" includes Microsoft and Microsoft’s affiliates.</p>
     <p><b>15.1 Disputes Covered—Everything Except IP.</b> The term "dispute" is as broad as it can be. It includes any claim or controversy between you and us concerning the Services, the software related to the Services, your account for this website, or these Terms, under any legal theory including contract, warranty, tort, statute, or regulation, <b>except disputes relating to the enforcement or validity of your, your licensors’, our, or our licensors’ intellectual property rights.</b></p> 
-    <p><b>15.2 Mail a Notice of Dispute First.</b> If you have a dispute and our customer service representatives can’t resolve it, send a Notice of Dispute by U.S. Mail to <b>Microsoft Corporation, ATTN: CELA Arbitration, One Microsoft Way, Redmond, WA 98052-6399, U.S.A.</b> Tell us your name, address, how to contact you, what the problem is, and what you want. A form is available at <a href="http://go.microsoft.com/fwlink/?LinkId=245499">http://go.microsoft.com/fwlink/?LinkId=245499.</a> We’ll do the same if we have a dispute with you. After 60 days, you or we may start an arbitration if the dispute is unresolved.</p> 
+    <p><b>15.2 Mail a Notice of Dispute First.</b> If you have a dispute and our customer service representatives can’t resolve it, send a Notice of Dispute by U.S. Mail to <b>Microsoft Corporation, ATTN: CELA Arbitration, One Microsoft Way, Redmond, WA 98052-6399, U.S.A.</b> Tell us your name, address, how to contact you, what the problem is, and what you want. A form is available at <a href="http://go.microsoft.com/fwlink/?LinkId=245499" data-mscc-ic="false">http://go.microsoft.com/fwlink/?LinkId=245499.</a> We’ll do the same if we have a dispute with you. After 60 days, you or we may start an arbitration if the dispute is unresolved.</p> 
     <p><b>15.3 Small Claims Court Option.</b> Instead of mailing a Notice of Dispute, you may sue us in small claims court in your county of residence (or if a business your principal place of business) or King County, Washington, U.S.A. if you meet the court’s requirements.</p>
-    <p><b>15.4 Arbitration Procedure.</b> The AAA will conduct any arbitration under its Commercial Arbitration Rules (or if you are an individual and use the Services for personal or household use, or if the value of the dispute is $75,000 or less whether or not you are an individual or how you use the Services, its Consumer Arbitration Rules). For more information, see <a href="http://www.adr.org">www.adr.org</a> or call 1-800-778-7879. To start an arbitration, submit the form available at <a href="http://go.microsoft.com/fwlink/?LinkId=245497">http://go.microsoft.com/fwlink/?LinkId=245497</a> to the AAA and mail a copy to us. In a dispute involving $25,000 or less, any hearing will be telephonic unless the arbitrator finds good cause to hold an in-person hearing instead. Any in-person hearing will take place in your county of residence (or if a business your principal place of business) or our principal place of business—King County, Washington if your dispute is with Microsoft. You choose. The arbitrator may award the same damages to you individually as a court could. The arbitrator may award declaratory or injunctive relief only to you individually to satisfy your individual claim.</p>
+    <p><b>15.4 Arbitration Procedure.</b> The AAA will conduct any arbitration under its Commercial Arbitration Rules (or if you are an individual and use the Services for personal or household use, or if the value of the dispute is $75,000 or less whether or not you are an individual or how you use the Services, its Consumer Arbitration Rules). For more information, see <a href="http://www.adr.org" data-mscc-ic="false">www.adr.org</a> or call 1-800-778-7879. To start an arbitration, submit the form available at <a href="http://go.microsoft.com/fwlink/?LinkId=245497" data-mscc-ic="false">http://go.microsoft.com/fwlink/?LinkId=245497</a> to the AAA and mail a copy to us. In a dispute involving $25,000 or less, any hearing will be telephonic unless the arbitrator finds good cause to hold an in-person hearing instead. Any in-person hearing will take place in your county of residence (or if a business your principal place of business) or our principal place of business—King County, Washington if your dispute is with Microsoft. You choose. The arbitrator may award the same damages to you individually as a court could. The arbitrator may award declaratory or injunctive relief only to you individually to satisfy your individual claim.</p>
     <p><b>15.5 Arbitration Fees and Payments.</b></p>
     <p>(a) <b>Disputes Involving $75,000 or Less.</b> We will promptly reimburse your filing fees and pay the AAA’s and arbitrator’s fees and expenses. If you reject our last written settlement offer made before the arbitrator was appointed, your dispute goes all the way to an arbitrator’s decision (called an “<b>award</b>”), and the arbitrator awards you more than this last written offer, we will: (i) pay the greater of the award or $1,000; (ii) pay your reasonable attorney’s fees, if any; and (iii) reimburse any expenses (including expert witness fees and costs) that your attorney reasonably accrues for investigating, preparing, and pursuing your claim in arbitration.</p>
     <p>(b) <b>Disputes Involving More than $75,000.</b> The AAA rules will govern payment of filing fees and the AAA’s and arbitrator’s fees and expenses.</p>
@@ -74,7 +74,7 @@
     <p><b>15.8 Rejecting Future Arbitration Changes.</b> You may reject any change we make to section 15 (except address changes) by sending us notice within 30 days of the change by U.S. Mail to the address in section 15.2. If you do, the most recent version of section 15 before the change you rejected will apply.</p> 
     <p><b>15.9 Severability.</b> If the class action waiver is found to be illegal or unenforceable as to all or some parts of a dispute, then those parts won’t be arbitrated but will proceed in court, with the rest proceeding in arbitration. If any other provision of section 15 is found to be illegal or unenforceable, that provision will be severed but the rest of section 15 still applies</p>
     <p><b>Section 16: Miscellaneous</b></p>
-    <p><b>16.1 Export restrictions.</b> The Microsoft Services, including products and software and related technology are subject to U.S. export jurisdiction. You must comply with all applicable international and national, laws including the U.S. Export Administration Regulations, the International Traffic in Arms Regulations, Office of Foreign Assets Control sanctions programs, and end-user, end use and destination restrictions by the U.S. and other governments related to Microsoft products, Services and technologies. For additional information, see <a href="https://www.microsoft.com/en-us/exporting/default.aspx">www.microsoft.com/exporting</a>.</p>
+    <p><b>16.1 Export restrictions.</b> The Microsoft Services, including products and software and related technology are subject to U.S. export jurisdiction. You must comply with all applicable international and national, laws including the U.S. Export Administration Regulations, the International Traffic in Arms Regulations, Office of Foreign Assets Control sanctions programs, and end-user, end use and destination restrictions by the U.S. and other governments related to Microsoft products, Services and technologies. For additional information, see <a href="https://www.microsoft.com/en-us/exporting/default.aspx" data-mscc-ic="false">www.microsoft.com/exporting</a>.</p>
     <p><b>16.2 Choice of Law and Place to Resolve Disputes.</b> If you live in (or, if a business, your principal place of business is in) the United States, the laws of the state where you live govern all claims, regardless of conflict of laws principles, except that the Federal Arbitration Act governs all provisions relating to arbitration. You and we irrevocably consent to the exclusive jurisdiction and venue of the state or federal courts in King County, Washington, for all disputes arising out of or relating to these TOS or the Services that are heard in court (excluding arbitration and small claims court).</p> 
     <p><b>16.3 Unsolicited Ideas.</b> Microsoft and its employees do not accept or consider unsolicited ideas. This includes ideas for new products, promotions, technologies, product names, product feedback and product improvements (“<b>Unsolicited Feedback</b>”). Please do not send any artwork, samples, demos, or other works to Microsoft or anyone at Microsoft. If you send any Unsolicited Feedback to Microsoft through the Services or otherwise, you acknowledge and agree that Microsoft shall not be under any obligation of confidentiality with respect to the Unsolicited Feedback.</p> 
     <p><b>16.4 Assignment.</b> Microsoft may assign, transfer or otherwise dispose our rights and obligations under these TOS, in whole or in part, at any time without notice to you. You may not assign, extend, sublicense or transfer any of your rights or obligations under these TOS or transfer any rights to access the Services and any attempt by you to do so is void.</p> 

From e5d3de36d7c37509bd7ea33b2a7224f90ea5c223 Mon Sep 17 00:00:00 2001
From: Kevser Sunercan <kevsers@microsoft.com>
Date: Fri, 27 Oct 2017 11:28:43 -0700
Subject: [PATCH 4/6] Removing consent time check temporarily (#135)

* consent time fix

* Revert "consent time fix"

This reverts commit 83c0b57c994b24666742476e1ac285bf3d1c26f9.

* remove time check for consent
---
 comprehensive/lms/static/cookieBanner.js | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/comprehensive/lms/static/cookieBanner.js b/comprehensive/lms/static/cookieBanner.js
index 470557b..a242ccc 100644
--- a/comprehensive/lms/static/cookieBanner.js
+++ b/comprehensive/lms/static/cookieBanner.js
@@ -141,18 +141,9 @@ $(document).ready(function () {
             css_link.type = "text/css";
             $("head").append(css_link);
 
-            // check if consent is still valid or we need to reconsent
-            var isConsentValid = false;
-            try {
-                if (cookieNotice.getCookie(cookieNotice.consentCookieName) > cookieNotice.MinimumConsentDate) {
-                    isConsentValid = true;
-                }
-            } catch (Error) {
-            }
-
             // add js
             cookieNotice.LoadJSCookieAPI(cookieNotice.Js).done(function () {
-                if (mscc && mscc.hasConsent() && isConsentValid) {
+                if (mscc && mscc.hasConsent()) {
                     // Add non-essiential cookies
                     cookieNotice.addBICookies();
                 } else if (mscc) {

From 3420bcd28625ec6e87a3849e642e0b449fd84ae0 Mon Sep 17 00:00:00 2001
From: Kevser Sunercan <kevsers@microsoft.com>
Date: Tue, 24 Oct 2017 10:29:29 -0700
Subject: [PATCH 5/6] remove about (#137)

---
 .../lms/templates/static_templates/about.html | 107 ------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 courses/lms/templates/static_templates/about.html

diff --git a/courses/lms/templates/static_templates/about.html b/courses/lms/templates/static_templates/about.html
deleted file mode 100644
index 879fbc4..0000000
--- a/courses/lms/templates/static_templates/about.html
+++ /dev/null
@@ -1,107 +0,0 @@
-## mako
-<%!
-  from django.core.urlresolvers import reverse
-  from django.utils.translation import ugettext as _
-%>
-<%namespace name='static' file='/static_content.html'/>
-
-<%inherit file="/main.html" />
-
-<%block name="title"><title>${_('About')}</title></%block>
-
-<%block name="js_extra">
-  <script type="text/javascript">
-    $(function() {
-      $('section.message').hide();
-      $('#about-menu a').removeClass('active');
-      window.scrollTo(0,0);
-      var hash = window.location.hash
-
-      if (hash) {
-        $('section' + hash).show();
-        $('#about-menu a.' + hash.substring(1)).addClass('active');
-      } else {
-        $('section#about').show();
-        $('#about-menu a.about').addClass('active');
-      }
-
-      $('#about-menu a').click(function(event) {
-        event.preventDefault();
-        $('#about-menu a').removeClass('active');
-        $(this).addClass('active');
-        var clickId = "section" + $(this).attr('href');
-        $('section.message').hide();
-        $(clickId).show();
-      });
-    });
-  </script>
-</%block>
-
-<section class="container about" style="width: auto;">
-  <nav id="about-menu">
-    <a href="#about" class="about active">${_('About')}</a>
-    <a href="#careers" class="careers">${_('Careers')}</a>
-    <a href="#contact" class="contact">${_('Contact')}</a>
-  </nav>
-
-  <section class="vision">
-
-## About Section ##
-    <section class="message left" id="about">
-      <div class="photo">
-        <!--
-            Photo License: CC0 Public Domain (Free for commercial use / No attribution required)
-            https://pixabay.com/en/book-books-circle-curly-education-2869/
-        -->
-        <img src="${static.url('/static/courses/images/about.jpg')}" alt="" />
-      </div>
-      <article>
-        <h2>${_('About')}</h2>
-
-        <p>Your about text goes here!</p>
-
-        <p>&nbsp;</p>
-      </article>
-      <hr class="fade-right-hr-divider">
-    </section>
-
-## Careers Section ##
-    <section class="message left" id="careers">
-      <div class="photo">
-        <!--
-            Photo License: CC0 Public Domain (Free for commercial use / No attribution required)
-            https://pixabay.com/en/man-corporate-businessman-suit-tie-871960/
-        -->
-        <img src="${static.url('/static/courses/images//careers.jpg')}" alt="" />
-      </div>
-      <article>
-        <h2>${_('Careers')}</h2>
-        
-        <p>Your job postings go here!</p>
-
-        <p>&nbsp;</p>
-      </article>
-      <hr class="fade-right-hr-divider">
-    </section>
-
-## Contact Section ##
-    <section class="message left" id="contact">
-      <div class="photo">
-        <!--
-            Photo License: CC0 Public Domain (Free for commercial use / No attribution required)
-            https://pixabay.com/en/network-cobweb-dewdrop-586177/
-        -->
-        <img src="${static.url('/static/courses/images/contact.jpg')}" alt="" />
-      </div>
-      <article id="stanford-OpenEdX-contact">
-        <h2>${_('Contact Us')}</h2>
-
-        <p>Your contact information goes here!</p>
-
-        <p>&nbsp;</p>
-      </article>
-      <hr class="fade-right-hr-divider">
-    </section>
-  </section>
-
-</section>

From cda322910d73fa9f3aebfa8c1a346280f579be4a Mon Sep 17 00:00:00 2001
From: Kevser Sunercan <kevsers@microsoft.com>
Date: Fri, 27 Oct 2017 10:29:48 -0700
Subject: [PATCH 6/6] Add signing in message to AAD login (#138)

* add signing in message

* put content only in body
---
 courses/lms/templates/login.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/courses/lms/templates/login.html b/courses/lms/templates/login.html
index aee7fb4..12df452 100644
--- a/courses/lms/templates/login.html
+++ b/courses/lms/templates/login.html
@@ -165,7 +165,11 @@ from third_party_auth import provider, pipeline
 <section class="login container">
   <section role="main" class="content">
     <form role="form" id="login-form" method="post" data-remote="true" action="/login_ajax" novalidate>
-
+      
+      <div>
+        <h2>We are signing you in now.</h2>
+      </div>
+      
       <!-- status messages -->
       <div role="alert" class="status message">
         <h3 class="message-title">${_("We're Sorry, {platform_name} accounts are unavailable currently").format(platform_name=platform_name)}</h3>