diff --git a/Source/AgreementTextView.swift b/Source/AgreementTextView.swift new file mode 100644 index 0000000000..5ed3a446ef --- /dev/null +++ b/Source/AgreementTextView.swift @@ -0,0 +1,63 @@ +// +// AgreementTextView.swift +// edX +// +// Created by Zeeshan Arif on 4/25/18. +// Copyright © 2018 edX. All rights reserved. +// + +import UIKit + +@objc enum AgreementType: UInt { + case signIn, + signUp +} + +@objc protocol AgreementTextViewDelegate: class { + func agreementTextView(_ textView: AgreementTextView, didSelect url: URL) +} + +class AgreementTextView: UITextView { + + weak var agreementDelegate: AgreementTextViewDelegate? + + @objc func setup(for type: AgreementType) { + let style = OEXMutableTextStyle(weight: .normal, size: .xSmall, color: OEXStyles.shared().neutralDark()) + style.lineBreakMode = .byWordWrapping + style.alignment = .center + let platformName = OEXConfig.shared().platformName() + let prefix: String + switch type { + case .signIn: + prefix = Strings.Agreement.textPrefixSignin + break + case .signUp: + prefix = Strings.Agreement.textPrefixSignup + break + } + let eulaText = Strings.Agreement.linkTextEula(platformName: platformName) + let tosText = Strings.Agreement.linkTextTos(platformName: platformName) + let privacyPolicyText = Strings.Agreement.linkTextPrivacyPolicy + let agreementText = "\(prefix)\(Strings.Agreement.text(eula: eulaText, tos: tosText, privacyPolicy: privacyPolicyText))" + var attributedString = style.attributedString(withText: agreementText) + if let eulaUrl = Bundle.main.url(forResource: "MobileAppEula", withExtension: "htm"), + let tosUrl = Bundle.main.url(forResource: "TermsOfServices", withExtension: "htm"), + let privacyPolicyUrl = Bundle.main.url(forResource: "PrivacyPolicy", withExtension: "htm") { + attributedString = attributedString.addLink(on: eulaText, value: eulaUrl) + attributedString = attributedString.addLink(on: tosText, value: tosUrl) + attributedString = attributedString.addLink(on: privacyPolicyText, value: privacyPolicyUrl) + } + attributedText = attributedString + isUserInteractionEnabled = true + isScrollEnabled = false + isEditable = false + delegate = self + } +} + +extension AgreementTextView: UITextViewDelegate { + func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange) -> Bool { + agreementDelegate?.agreementTextView(self, didSelect: URL) + return false + } +} diff --git a/Source/COURSE_NOT_LISTED.htm b/Source/COURSE_NOT_LISTED.htm deleted file mode 100644 index b887d3549c..0000000000 --- a/Source/COURSE_NOT_LISTED.htm +++ /dev/null @@ -1,452 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
- -

We're working hard to make all of our courses mobile-friendly. -If you don't see your course yet, it will be available soon - -we're adding more every day!

- -

 

- -
- - - - diff --git a/Source/EULA.htm b/Source/EULA.htm deleted file mode 100644 index 1b3647d3d0..0000000000 --- a/Source/EULA.htm +++ /dev/null @@ -1,932 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
- -

END USER LICENSE AGREEMENT

- -

 

- -

 

- -

THE EDX APPLICATION (the Application) AND INCLUDED INFORMATION, -DOCUMENTS, IMAGES, VIDEOS, DATA, LECTURES, NOTES, AND OTHER MATERIALS, IN ALL -FORMATS AND MEDIUMS (COLLECTIVELY, THE CONTENT) -ARE PROVIDED BY EDX, INC. (EDX). 

- -

 

- -

AS USED IN THIS EULA, YOU OR YOUR REFERS TO THE -PERSON OR ENTITY WHO DOWNLOADS AND USES THE APPLICATION AND CONTENT.  ADDITIONALLY, EDX and You are referred to collectively as the Parties and -individually as a Party.

- -

 

- -

BY INSTALLING AND USING THIS APPLICATION, YOU ARE -AGREEING TO BE BOUND BY THE TERMS AND CONDITIONS SET FORTH IN THIS END USER -LICENSE AGREEMENT (EULA), -THE TERMS OF SERVICE AND -HONOR CODE AND PRIVACY POLICY POSTED AT EDX.ORG (EDX -TERMS, WITH THE EULA AND EDX TERMS REFERRED TO COLLECTIVELY AS THE AGREEMENT).  IF YOU DO -NOT AGREE, YOU ARE PROHIBITED FROM USING THIS APPLICATION.

- -

 

- - - -

YOUR RIGHT TO USE THE APPLICATION AND CONTENT SHALL -TERMINATE IMMEDIATELY UPON THE FIRST TO OCCUR OF YOUR NONCOMPLIANCE WITH THE AGREEMENT, -OR UNINSTALLATION OF THE APPLICATION FROM YOUR MOBILE DEVICE.

- -

 

- -

CERTAIN -VERSIONS OF THIS APPLICATION REQUIRE REGISTRATION AND COURSE ENROLLMENT VIA -EDX.ORG.  BY USING THIS APPLICATION -AND THE CONTENT, YOU HEREBY COVENANT TO EDX THAT YOU ARE PROPERLY REGISTERED TO -PARTICIPATE IN THE RELEVANT COURSE(S), PER THE EDX -TERMS.

- -

 

- -

YOUR USE -OF THE APPLICATION AND CONTENT SHALL CONSTITUTE YOUR UNDERSTANDING OF, AND -AGREEMENT TO THE AGREEMENT (AND RATIFICATION OF ANY PREVIOUS CONSENT MADE BY -YOU).

- -

 

- -

 

- -

1.   OWNERSHIP OF THE APPLICATION & CONTENT.  The Application and Content are the -copyrighted work of EDX and/or its licensors and suppliers.  You agree that the Application and -Content contain proprietary and copyright protected material and, the design -and structure of the Application as well as the compilation of the Content each -contain valuable trade secrets and copyrighted material and other intellectual -property rights exclusively owned by EDX and its licensors.  You acknowledge and agree that as -between You and EDX, EDX is and shall remain the sole -and excusive owner of all rights, title, and interest in and to the Application -and the Content, including any patents, copyrights, trade secrets, and any -other intellectual and industrial property rights related thereto.  You acknowledge and agree not to take -any action inconsistent with such ownership. If You -create any derivative works in violation of this EULA based, in whole or in -part, on the Application or the Content, You shall and hereby do assign all -rights, title, and interest in and to such derivative works free and clear of -any liens, claims, or encumbrances to EDX.

- -

2.   GRANT OF LICENSE.  EDX grants You a personal, -limited, non-exclusive, non-transferable, revocable license to (i) install and use the Application in object code form on a -single mobile device; and (ii) use the Content, including any updates and -enhancements, only on Your mobile device, and subject to the terms and -conditions found in the Agreement (the License).  Except as otherwise expressly provided, EDX -grants no other express or implied rights to You in -regard to the Application or the Content.  -

- -

3.   RESTRICTIONS -ON USE OF APPLICATION & CONTENT.

- -

      The -License granted to You may not be sublicensed, -commercially distributed, or shared with any third party without the prior -written consent of EDX.  Except as otherwise -granted hereunder, You shall not:  (i) copy, distribute, reproduce, rent, lend, loan, or -sublicense any portion of the Application or Content; (ii) translate, adapt, -modify, alter, or combine the Application or Content with other applications or -software, materials, or prepare derivative works based in whole or in part, on -the Application or Content; (iii) use the Application or Content in a -computer-based services business; (iv) following the initial download, transmit -the Application over a network, by telephone, or electronically using any -means; or (v) reverse engineer, decompile, disassemble, or otherwise -reduce the Application or any of its subcomponents to a human-perceivable form.

- -

      Subject to the -foregoing, Content may be viewed in offline sync mode, as well as within the -Application; however, You may not share or use Content except as necessary for -participation in the related course for which your are registered.  All Content will be deleted upon -uninstallation of the Application to the extent the same has been downloaded to -your device.

- -

4.   Additional Application/Services.  EDX -may, in its sole discretion, develop and deliver or offer updates, supplements, -add-on components, product support services, or Internet-based service components -(collectively Supplemental Components) -for the Application from time to time.  -The terms of the Agreement shall apply to Supplement Components that You may obtain from -EDX or an EDX Application supplier.  -For purposes of the balance of the provisions contained in the -Agreement, the Supplemental Components shall be deemed included in the term -Application.

- -

5.   EQUITABLE -REMEDIES AND ENFORCEMENT.  You acknowledge and agree that Your -breach of any of the obligations set forth in Sections 1, 2, 3, and 9 of this -EULA shall cause EDX irreparable injury and shall entitle EDX to equitable -relief or remedy.  The pursuit or -securing of any such equitable relief shall not prohibit or limit EDX from -seeking or obtaining any other remedy provided under this EULA or by law.  If any or all of the above covenants or -agreements are held to be unenforceable because of the scope or duration of -such covenant or agreement or the area covered thereby, the Parties agree that -the court making such determination shall have the power to reduce the scope, -duration and area of such covenant or agreement to the extent that allows the -maximum scope, duration and area permitted by applicable law.  The covenants, agreements and remedies -provided herein are in addition to, and are not to be construed as a -replacement for or limited by, the rights and remedies otherwise available to EDX -including, but not limited to, those rights and remedies contained in the -Uniform Trade Secrets Act, or its state counterparts.

- -

6.   Disclaimer of -Warranty.  YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT -USE OF THE APPLICATION AND CONTENT IS AT YOUR SOLE RISK AND THAT THE ENTIRE -RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY AND EFFORT IS WITH YOU. EDX -AND ITS LICENSORS, AGENTS, OFFICERS, DIRECTORS, EMPLOYEES, SUCCESSORS, ASSIGNS, -AND AFFILIATES PROVIDE THE APPLICATION AND CONTENT AS IS WITH ALL FAULTS -WITHOUT WARRANTY OF ANY KIND, AND EDX ON BEHALF OF ITSELF AND ITS LICENSORS HEREBY -EXPRESSLY DISCLAIMS ANY EXPRESS OR IMPLIED WARRANTIES OF TITLE, -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, SATISFACTORY QUALITY, AND -NON-INFRINGEMENT.  EDX DOES NOT -WARRANT AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE APPLICATION AND CONTENT, -THAT THE FUNCTIONS CONTAINED IN THE APPLICATION WILL MEET YOUR REQUIREMENTS, -THAT THE APPLICATION IS FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS, THAT THE -OPERATION OF THE APPLICATION WILL BE UNINTERRUPTED OR ERROR-FREE, THAT DEFECTS -IN THE APPLICATION WILL BE CORRECTED, OR THAT THE FUNCTIONS CONTAINED IN THE -APPLICATION WILL FUNCTION WITH OTHER SOFTWARE OR HARDWARE, OR WITHIN A -PARTICULAR SYSTEM.  NO ORAL OR -WRITTEN INFORMATION OR ADVICE GIVEN BY EDX OR AN EDX AUTHORIZED REPRESENTATIVE -SHALL CREATE A WARRANTY. SHOULD THE APPLICATION PROVE DEFECTIVE, YOU ASSUME THE -ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR, OR -CORRECTION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES -OR LIMITATIONS ON APPLICABLE STATUTORY RIGHTS OF A CONSUMER, SO THE ABOVE -EXCLUSION MAY NOT APPLY TO YOU.

- -

7.   Limitation of Liability.  TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW AND REGARDLESS OF WHETHER -ANY REMEDY FAILS OF ITS ESSENTIAL PURPOSE,  IN NO EVENT SHALL EDX OR ITS LICENSORS, AGENTS, -OFFICERS, DIRECTORS, EMPLOYEES, SUCCESSORS, ASSIGNS, OR AFFILIATES BE -LIABLE  FOR PERSONAL INJURY, OR ANY -INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL, OR PUNITIVE DAMAGES, WHATSOEVER, INCLUDING, WITHOUT LIMITATION, DAMAGES -FOR LOSS OF PROFITS, LOST TIME, LOST SAVINGS, -LOSS OF DATA, DAMAGED DATA, INACCURATE DATA, FAILURE OF TELECOMMUNICATION -SERVICES, LOST CONFIDENTIAL OR OTHER -INFORMATION, OR FOR BUSINESS INTERRUPTION OR ANY OTHER COMMERCIAL -DAMAGES OR LOSSES ARISING -OUT OF OR RELATED TO YOUR USE OR INABILITY TO USE THE APPLICATION OR CONTENT, -HOWEVER CAUSED, REGARDLESS OF THE THEORY OF LIABILITY (TORT, CONTRACT OR -OTHERWISE) AND EVEN IF EDX HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY FOR PERSONAL -INJURY, OR OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT -APPLY TO YOU.  THE FOREGOING -LIMITATIONS WILL APPLY EVEN IF THE ABOVE STATED REMEDY FAILS OF ITS ESSENTIAL -PURPOSE.

- -
- - -

 

- -

8.   Indemnification.  You -agree to indemnify, hold harmless, and defend EDX, its licensors, agents, -officers, directors, employees, successors, assigns, and affiliates, from and -against any action, cause, claim, damage, debt, demand or liability, including -reasonable costs and attorneys fees, asserted by any person, arising out of or -relating to the breach of this EULA.

- -

9.   EXPORT -RESTRICTIONS.  You acknowledge that the -Application is of U.S. origin, and agree to comply with all applicable -international and national laws that apply to the Application, including the -U.S. Export Administration Regulations, as well as end-user, end-use and -country destination restrictions issued by the U.S. and other governments.

- -

10.  Government -End Users.  If You are acquiring the Application on behalf of any unit or -agency of the United States Government, it is provided to the Government only -with restricted rights and limited rights.  -Use, duplication, or disclosure by the Government is subject to restrictions -set forth in FAR Sections 52-227-14 and 52-227-19 or DFARS Section -52.227-7013(C)(1)(ii), as applicable.  -The Application and Application documentation, if any, are -"Commercial Items," as that term is defined at 48 C.F.R. 2.101, -consisting of "Commercial Computer Application" and "Commercial -Computer Application Documentation," as such terms are used in 48 C.F.R. -1 2.21 2 or 48 C.F.R. 227.7202, as applicable.

- -

11.  TERMINATION.  Without prejudice to any other -rights, EDX may terminate this EULA if You fail -to comply with the terms and conditions of this EULA.  In such event, You -must immediately remove the Application from Your mobile device including all of its component parts.

- -

12.  Entire Agreement.  The -Agreement constitutes the entire agreement between the Parties related to the -Application and Content and supersedes any and all prior and contemporaneous -oral or written understandings between the Parties relating to the subject -matter hereof.

- -

13.  Modification and Waiver.  EDX shall have the right -to modify the terms and conditions of this EULA without prior notice to You.  Any waiver -shall be limited to the circumstance or event specifically referenced in the -written waiver document and shall not be deemed a waiver of any other term in -this EULA or of the same circumstance or event upon any recurrence thereof.

- -

14.  BINDING EFFECT.  This EULA shall be binding -upon and inure to the benefit of the Parties respective successors or assigns.

- -

15.  Validity.  If any part of this EULA is determined -to be invalid or unenforceable by a court of competent jurisdiction or by any -other legal constituted body having the jurisdiction to make such -determination, the remainder of this EULA shall remain in full force and -effect.

- -

16.  Governing Law and Jurisdiction.  This -EULA shall be deemed to have been made in the Commonwealth of Massachusetts and shall be -governed by, construed, and interpreted in accordance with the laws of -the Commonwealth of Massachusetts.  With respect to any dispute, -controversy, or claim arising out of or relating to this EULA or the relationship -between the Parties, the Parties agree and consent to jurisdiction of and -exclusive venue in the United States District Court, District of Massachusetts, -Boston Division or in the Boston Municipal Court.  The Agreement shall -not be governed by the United Nations Convention on Contracts for the -International Sale of Goods, the application of which is hereby expressly -excluded.  You hereby -expressly waive Your right to trial by jury.

- -

17.  Third-Party -Beneficiaries.  Use of -the Application and Content is for Your personal -benefit.  This EULA does not  confer any -rights to any other person or entity as a third-party beneficiary or otherwise.

- -

18.  Headings.  The headings of this EULA are for the -purpose of reference only and shall not in any way limit or affect the meaning -or interpretation of any of the terms hereof.

- -

19.  DATE.  This EULA was last updated on September 16, -2014.

- -

 

- -
- - - - diff --git a/Source/MobileAppEula.htm b/Source/MobileAppEula.htm new file mode 100644 index 0000000000..02dd13db4f --- /dev/null +++ b/Source/MobileAppEula.htm @@ -0,0 +1,1008 @@ + + + + + + + + + + + + + + + + + + + +
+ +

EDX END USER LICENSE +AGREEMENT
+
+
+THIS END USER LICENSE AGREEMENT (“EULA”) SETS +FORTH THE TERMS AND CONDITIONS GOVERNING THE USE OF ANY EDX MOBILE APPLICATION DOWNLOADED +OR OTHERWISE ACQUIRED BY YOU (THE “APPLICATION”) AS PROVIDED BY EDX INC. (“EDX”). 
+
+BY INSTALLING AND USING THIS APPLICATION, YOU +AGREE TO BE BOUND BY THE TERMS AND CONDITIONS SET FORTH IN THIS EULA. YOUR USE +OF THE APPLICATION IS SUBJECT TO:

+ +

·       TERMS +OF SERVICE AND HONOR CODE,

+ +

·       PRIVACY +POLICY, AND

+ +

·       ALL OTHER AGREEMENTS AND POLICIES APPLICABLE TO +YOU AT THE EDX +WEBSITE. 

+ +

 

+ +

YOU ACKNOWLEDGE THAT THIS +EULA IS ENTERED INTO BETWEEN YOU AND EDX. IF YOU DO NOT UNDERSTAND OR DO NOT +WISH TO ACCEPT OR BE BOUND BY THE TERMS OF THIS EULA, DO NOT USE THIS +APPLICATION.
+
+AS USED IN THIS EULA, “YOU” OR “YOUR” REFERS TO +THE PERSON OR ENTITY WHO DOWNLOADS AND USES THE APPLICATION.  +ADDITIONALLY, EDX AND YOU ARE REFERRED TO COLLECTIVELY AS THE “PARTIES” AND +INDIVIDUALLY AS A “PARTY.”
+
+1.  OWNERSHIP OF THE APPLICATION.  All +right, title, and interest in and to the Application and all improvements, +additions, updates, supplements, derivatives and other modifications thereto are +and shall remain the exclusive property of edX and/or +its licensors.  You agree not to, +directly or indirectly, disclose, sell or otherwise transfer or exploit the Application +to any other person or entity or allow any other person or entity to use the Application +without the prior written consent of edX, which may +be withheld in edX’s sole discretion. You further +agree not to challenge or assist with or participate in any challenge, directly +or indirectly, or edX’s ownership of the Application or +any right title or interest therein or any portion thereof.
+
+2.  GRANT OF LICENSE.  EdX grants You a personal, +limited, non-exclusive, non-transferable, revocable license to install and use +the Application in object code form on a single mobile device in accordance +with the terms and conditions of this EULA. The Application is licensed, not +sold, to You by edX, and edX reserves all rights in the Application not expressly +granted to You. EdX may do any of the following at +any time, with or without notice or cause, and without any liability to You: (a) change, suspend, or terminate any features or +functionality on the Application; (b) impose limits on certain features or +functionality on the Application; (c) terminate this EULA.

+ +

 

+ +

Upon such termination or +expiration, You shall no longer be permitted to use +the Application and shall immediately delete or destroy all copies of the +Application from Your mobile device including all of its component parts. +Modification, suspension, or termination of the Application or this EULA shall +not entitle You to any refund, credit, or other +compensation from edX under this EULA or any other +agreement or from any third party.  Without +prejudice to any other rights, edX may terminate this +EULA if You fail to comply with the terms and +conditions of the EULA.  In such event, You must +immediately remove the Application from Your mobile device including all of its +component parts
+
+3.  RESTRICTIONS ON USE +OF APPLICATION.  The License +granted to You may not be sublicensed, commercially +distributed, or shared with any third party without the prior written consent +of edX.  Except as otherwise expressly granted +hereunder, You shall not:  (i) copy, distribute, +reproduce, rent, lend, loan, or sublicense any portion of the Application; (ii) +translate, adapt, modify, alter, or combine the Application with other +applications or software, materials, or prepare derivative works based in whole +or in part, on the Application; (iii) use the Application in a computer-based +services business; (iv) following the initial download, transmit the +Application over a network, by telephone, or electronically using any means; or +(v) reverse engineer, decompile, disassemble, or otherwise reduce the +Application or any of its subcomponents to a human-perceivable form.
+
+4.  EQUITABLE REMEDIES AND +ENFORCEMENT.  You acknowledge and agree that Your breach of any of the +obligations set forth in Sections A(1), A(2), A(3), and +A(8) of this EULA shall cause edX irreparable injury +and shall entitle edX to equitable relief or +remedy.  The pursuit or securing of any such equitable relief shall not +prohibit or limit edX from seeking or obtaining any +other remedy provided under this EULA or by law.  If any or all of the +above covenants or agreements are held to be unenforceable because of the scope +or duration of such covenant or agreement or the area covered thereby, the +Parties agree that the court making such determination shall have the power to +reduce the scope, duration and area of such covenant or agreement to the extent +that allows the maximum scope, duration and area permitted by applicable +law.  The covenants, agreements and remedies provided herein are in +addition to, and are not to be construed as a replacement for or limited by, +the rights and remedies otherwise available to edX +including, but not limited to, those rights and remedies contained in the +Uniform Trade Secrets Act, or its state counterparts.
+
+5.  DISCLAIMER OF WARRANTY.  YOU +EXPRESSLY ACKNOWLEDGE AND AGREE THAT USE OF THE APPLICATION IS AT YOUR SOLE +RISK AND THAT THE ENTIRE RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY +AND EFFORT IS WITH YOU. EDX AND ITS LICENSORS, AGENTS, OFFICERS, DIRECTORS, +EMPLOYEES, SUCCESSORS, ASSIGNS, AFFILIATES, AND MEMBERS PROVIDE THE APPLICATION +“AS IS WITH ALL FAULTS” WITHOUT WARRANTY OF ANY KIND, AND EDX ON BEHALF OF +ITSELF AND ITS LICENSORS AND EACH MEMBER HEREBY EXPRESSLY DISCLAIMS ANY EXPRESS +OR IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR +PURPOSE, SATISFACTORY QUALITY, AND NON-INFRINGEMENT.  EDX DOES NOT WARRANT +AGAINST INTERFERENCE WITH YOUR ENJOYMENT OF THE APPLICATION, THAT THE FUNCTIONS +CONTAINED IN THE APPLICATION WILL MEET YOUR REQUIREMENTS, THAT THE APPLICATION +IS FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS, THAT THE OPERATION OF THE +APPLICATION WILL BE UNINTERRUPTED OR ERROR-FREE, THAT DEFECTS IN THE +APPLICATION WILL BE CORRECTED, OR THAT THE FUNCTIONS CONTAINED IN THE +APPLICATION WILL FUNCTION WITH OTHER SOFTWARE OR HARDWARE, OR WITHIN A +PARTICULAR SYSTEM.  NO ORAL OR WRITTEN INFORMATION OR ADVICE GIVEN BY EDX, +A MEMBER, OR AN EDX AUTHORIZED REPRESENTATIVE SHALL CREATE A WARRANTY. SHOULD +THE APPLICATION PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR, OR CORRECTION. SOME +JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES OR LIMITATIONS +ON APPLICABLE STATUTORY RIGHTS OF A CONSUMER, SO THE ABOVE EXCLUSION MAY NOT +APPLY TO YOU.
+
+6.  LIMITATION OF LIABILITY.  TO THE +MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW AND REGARDLESS OF WHETHER ANY REMEDY +FAILS OF ITS ESSENTIAL PURPOSE,  IN NO EVENT +SHALL EDX OR ITS LICENSORS, AGENTS, OFFICERS, DIRECTORS, EMPLOYEES, SUCCESSORS, +ASSIGNS, AFFILIATES OR MEMBERS BE LIABLE  FOR PERSONAL INJURY, OR ANY +INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL, OR PUNITIVE DAMAGES, WHATSOEVER, +INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF PROFITS, LOST TIME, LOST +SAVINGS, LOSS OF DATA, DAMAGED DATA, INACCURATE DATA, FAILURE OF +TELECOMMUNICATION SERVICES, LOST CONFIDENTIAL OR OTHER INFORMATION, OR FOR +BUSINESS INTERRUPTION OR ANY OTHER COMMERCIAL DAMAGES OR LOSSES ARISING OUT OF +OR RELATED TO YOUR USE OR INABILITY TO USE THE APPLICATION, HOWEVER CAUSED, +REGARDLESS OF THE THEORY OF LIABILITY (TORT, CONTRACT OR OTHERWISE) AND EVEN IF +EDX HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. SOME JURISDICTIONS DO +NOT ALLOW THE LIMITATION OF LIABILITY FOR PERSONAL INJURY, OR OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT APPLY TO YOU.  THE FOREGOING +LIMITATIONS WILL APPLY EVEN IF THE ABOVE STATED REMEDY FAILS OF ITS ESSENTIAL +PURPOSE.
+
+7.  INDEMNIFICATION.  You agree to +indemnify, hold harmless, and defend edX, its +licensors, agents, officers, directors, employees, successors, assigns, affiliates, +and Members, from and against any action, cause, claim, damage, debt, demand or +liability, including reasonable costs and attorneys’ fees, asserted by any +person, arising out of or relating to the breach of this EULA.
+
+8.  EXPORT RESTRICTIONS.  You +acknowledge that the Application is of U.S. origin, and agree to comply with +all applicable international and national laws that apply to the Application, +including the U.S. Export Administration Regulations, as well as end-user, +end-use and country destination restrictions issued by the U.S. and other +governments.
+
+9.  GOVERNMENT END USERS.  If You are acquiring the Application on behalf of any unit or +agency of the United States Government, it is provided to the Government only +with restricted rights and limited rights.  Use, duplication, or +disclosure by the Government is subject to restrictions set forth in FAR +Sections 52-227-14 and 52-227-19 or DFARS Section 52.227-7013(C)(1)(ii), as +applicable.  The Application and Application documentation, if any, are +"Commercial Items," as that term is defined at 48 C.F.R. \A42.101, +consisting of "Commercial Computer Application" and "Commercial +Computer Application Documentation," as such terms are used in 48 C.F.R. +\A41 2.21 2 or 48 C.F.R. \A4227.7202, as applicable.
+
+10.  TERMINATION.  Without prejudice +to any other rights, edX may terminate this EULA if You fail to comply with the terms and conditions of the EULA.  +In such event, You must immediately remove the +Application from Your mobile device including all of its component parts.
+
+11.  ENTIRE AGREEMENT.  The EULA +constitutes the entire agreement between the Parties related to the Application +and supersedes any and all prior and contemporaneous oral or written +understandings between the Parties relating to the subject matter hereof.
+
+12.  MODIFICATION +AND WAIVER.  EdX reserves the right to modify this +EULA at any time without advance notice to You. Any changes to this EULA +will be effective immediately for new and current users, with an updated +effective date. By continuing to use the Application after any changes have +been made, you signify your agreement on a prospective basis to the modified EULA +and all of the changes. You should return to this EULA periodically to ensure +familiarity with the most current version. Any waiver shall be limited to the circumstance or event +specifically referenced in the written waiver document and shall not be deemed +a waiver of any other term in this EULA or of the same circumstance or event +upon any recurrence thereof.
+
+13.  BINDING EFFECT; VALIDITY.  This EULA +shall be binding upon and inure to the benefit of the Parties’ respective +successors or assigns. If any part of this EULA is determined to be invalid or unenforceable by +a court of competent jurisdiction or by any other legal constituted body having +the jurisdiction to make such determination, the remainder of this EULA shall remain in full force and effect.
+
+14.  GOVERNING LAW AND JURISDICTION.  +This EULA shall be deemed to have been made in the Commonwealth of +Massachusetts and shall be governed by, construed, and interpreted in accordance with the laws of the +Commonwealth of Massachusetts. With respect to any dispute, controversy, +or claim arising out of or relating to this EULA or the relationship between the Parties, the +Parties agree and consent to jurisdiction of and exclusive venue in the United +States District Court, District of Massachusetts, Boston +Division or in the Boston Municipal Court. The EULA shall not be governed by the United Nations +Convention on Contracts for the International Sale of Goods, the application of +which is hereby expressly excluded. You hereby expressly waive Your +right to trial by jury.
+
+15.  NO THIRD-PARTY BENEFICIARIES.  +Use of the Application is for Your personal +benefit.  This EULA does not confer any rights to any other person or entity +as a third-party beneficiary or otherwise.
+
+16.  HEADINGS.  The headings of this EULA are for the purpose of reference only and shall +not in any way limit or affect the meaning or interpretation of any of the +terms hereof.
+
+17.  DATE.  This EULA was last updated on May 25, 2018.
+
+
+
+
+

+ +

 

+ +
+ + + + diff --git a/Source/NEW_USER.htm b/Source/NEW_USER.htm deleted file mode 100644 index a901e748d5..0000000000 --- a/Source/NEW_USER.htm +++ /dev/null @@ -1,458 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
- -

EdX offers free online courses on your computer from -the world's top educational institutions. This companion app lets you watch -lecture videos for your courses on the go.

-
-

To use this companion app, -sign up on edx.org from your computer - and enroll in a mobile-friendly course.
- -Preview mobile-friendly courses

- -

 

-
- - diff --git a/Source/NSAttributedString+Formatting.swift b/Source/NSAttributedString+Formatting.swift index 568f13afc2..2211442fad 100644 --- a/Source/NSAttributedString+Formatting.swift +++ b/Source/NSAttributedString+Formatting.swift @@ -8,6 +8,23 @@ import Foundation +extension NSAttributedString { + func addLink(on subString: String, value: URL) -> NSAttributedString { + if string.contains(find: subString) { + let mutableAttributedString = NSMutableAttributedString(attributedString: self) + let range = (string as NSString).range(of: subString) + let attributes = [ + NSLinkAttributeName: value, + NSForegroundColorAttributeName: OEXStyles.shared().primaryBaseColor() + ] as [String : Any] + mutableAttributedString.addAttributes(attributes, range: range) + return mutableAttributedString + } + + return self + } +} + extension OEXTextStyle { func apply(f : @escaping (String) -> String) -> ((NSAttributedString) -> NSAttributedString) { diff --git a/Source/OEXLoginViewController.m b/Source/OEXLoginViewController.m index 321dc17aa0..89d84ea643 100644 --- a/Source/OEXLoginViewController.m +++ b/Source/OEXLoginViewController.m @@ -9,14 +9,10 @@ @import edXCore; #import "OEXLoginViewController.h" - #import "edX-Swift.h" - #import - #import "NSString+OEXValidation.h" #import "NSJSONSerialization+OEXSafeAccess.h" - #import "OEXAnalytics.h" #import "OEXAppDelegate.h" #import "OEXCustomButton.h" @@ -40,7 +36,7 @@ #define USER_EMAIL @"USERNAME" -@interface OEXLoginViewController () +@interface OEXLoginViewController () { CGPoint originalOffset; // store the offset of the scrollview. UITextField* activeField; // assign textfield object which is in active state. @@ -50,9 +46,6 @@ @interface OEXLoginViewController () @property (nonatomic, strong) NSString* signInID; @property (nonatomic, strong) NSString* signInPassword; @property (nonatomic, assign) BOOL reachable; -@property (weak, nonatomic, nullable) IBOutlet UIWebView* webview_EULA; -@property (weak, nonatomic, nullable) IBOutlet UIButton* btn_OpenEULA; -@property (weak, nonatomic, nullable) IBOutlet UIImageView* img_SeparatorEULA; @property (strong, nonatomic) IBOutlet UIView* externalAuthContainer; @property (weak, nonatomic, nullable) IBOutlet OEXCustomLabel* lbl_OrSignIn; @property(nonatomic, strong) IBOutlet UIImageView* seperatorLeft; @@ -62,16 +55,8 @@ @interface OEXLoginViewController () @property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_MapTop; @property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_UsernameTop; @property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_PasswordTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_ForgotTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_SignInTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_SignTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_separatorTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_BySigningTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_EULATop; @property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_UserGreyTop; @property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_PassGreyTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_LeftSepTop; -@property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_RightSepTop; @property (weak, nonatomic, nullable) IBOutlet NSLayoutConstraint* constraint_ActivityIndTop; @property (weak, nonatomic, nullable) IBOutlet UITextField* tf_EmailID; @@ -81,14 +66,13 @@ @interface OEXLoginViewController () @property (weak, nonatomic, nullable) IBOutlet UIScrollView* scroll_Main; @property (weak, nonatomic, nullable) IBOutlet UIImageView* img_Map; @property (weak, nonatomic, nullable) IBOutlet UIImageView* img_Logo; -@property (weak, nonatomic, nullable) IBOutlet UILabel* lbl_Redirect; +@property (weak, nonatomic) IBOutlet AgreementTextView *agreementTextView; +@property (weak, nonatomic) IBOutlet NSLayoutConstraint *agreementTextViewHeight; +@property (weak, nonatomic) IBOutlet NSLayoutConstraint *agreementTextViewTop; @property (weak, nonatomic, nullable) IBOutlet UIActivityIndicatorView* activityIndicator; @property (strong, nonatomic) IBOutlet UILabel* versionLabel; - @property (nonatomic, assign) id authProvider; @property (nonatomic) OEXTextStyle *placeHolderStyle; -@property (nonatomic) OEXMutableTextStyle *buttonsTitleStyle; - @end @@ -99,6 +83,7 @@ - (void)layoutSubviews { self.lbl_OrSignIn.hidden = YES; self.seperatorLeft.hidden = YES; self.seperatorRight.hidden = YES; + self.agreementTextViewTop.constant = -30; } if(IS_IPHONE_4) { @@ -107,26 +92,7 @@ - (void)layoutSubviews { self.constraint_UserGreyTop.constant = 20; self.constraint_PasswordTop.constant = 8; self.constraint_PassGreyTop.constant = 8; - self.constraint_ForgotTop.constant = 8; - self.constraint_SignInTop.constant = 13; self.constraint_ActivityIndTop.constant = 43; - self.constraint_SignTop.constant = 9; - - if([self isGoogleEnabled] || [self isFacebookEnabled]) { - self.constraint_LeftSepTop.constant = 18; - self.constraint_RightSepTop.constant = 18; - self.constraint_BySigningTop.constant = 69; - self.constraint_EULATop.constant = 73; - } - else { - self.lbl_OrSignIn.hidden = YES; - self.seperatorLeft.hidden = YES; - self.seperatorRight.hidden = YES; - self.constraint_LeftSepTop.constant = 18; - self.constraint_RightSepTop.constant = 18; - self.constraint_BySigningTop.constant = 18; - self.constraint_EULATop.constant = 23; - } } else { self.constraint_MapTop.constant = 90; @@ -134,20 +100,7 @@ - (void)layoutSubviews { self.constraint_UserGreyTop.constant = 25; self.constraint_PasswordTop.constant = 12; self.constraint_PassGreyTop.constant = 12; - self.constraint_ForgotTop.constant = 12; - self.constraint_SignInTop.constant = 20; self.constraint_ActivityIndTop.constant = 55; - self.constraint_SignTop.constant = 15; - if([self isGoogleEnabled] || [self isFacebookEnabled]) { - self.constraint_LeftSepTop.constant = 25; - self.constraint_RightSepTop.constant = 25; - self.constraint_BySigningTop.constant = 85; - self.constraint_EULATop.constant = 88; - } - else { - self.constraint_BySigningTop.constant = 25; - self.constraint_EULATop.constant = 30; - } } } @@ -222,8 +175,15 @@ - (void)viewDidLoad { } _placeHolderStyle = [[OEXTextStyle alloc] initWithWeight:OEXTextWeightNormal size:OEXTextSizeBase color:[[OEXStyles sharedStyles] neutralDark]]; - _buttonsTitleStyle = [[OEXMutableTextStyle alloc] initWithWeight:OEXTextWeightBold size:OEXTextSizeBase color:[[OEXStyles sharedStyles] primaryBaseColor]]; [self setAccessibilityIdentifiers]; + [self setUpAgreementTextView]; +} + +-(void) setUpAgreementTextView { + [self.agreementTextView setupFor:AgreementTypeSignIn]; + self.agreementTextView.agreementDelegate = self; + // To adjust textView according to its content size. + self.agreementTextViewHeight.constant = self.agreementTextView.contentSize.height + [self.environment.styles standardHorizontalMargin]; } //setting accessibility identifiers for developer automation use @@ -231,9 +191,7 @@ - (void)setAccessibilityIdentifiers { self.img_Logo.accessibilityIdentifier = @"LoginViewController:logo-image-view"; self.tf_EmailID.accessibilityIdentifier = @"LoginViewController:email-text-field"; self.tf_Password.accessibilityIdentifier = @"LoginViewController:password-text-field"; - self.img_SeparatorEULA.accessibilityIdentifier = @"LoginViewController:separator-image-view"; - self.lbl_Redirect.accessibilityIdentifier = @"LoginViewController:redirect-label"; - self.btn_OpenEULA.accessibilityIdentifier = @"LoginViewController:open-eula-button"; + self.agreementTextView.accessibilityIdentifier = @"LoginViewController:agreement-text-view"; self.externalAuthContainer.accessibilityIdentifier = @"LoginViewController:external-auth-container-view"; self.seperatorLeft.accessibilityIdentifier = @"LoginViewController:left-seperator-image-view"; self.seperatorRight.accessibilityIdentifier = @"LoginViewController:right-seperator-image-view"; @@ -251,20 +209,12 @@ - (void)navigateBack { } - (void)setExclusiveTouch { - self.btn_OpenEULA.exclusiveTouch = YES; self.btn_Login.exclusiveTouch = YES; self.btn_TroubleLogging.exclusiveTouch = YES; self.view.multipleTouchEnabled = NO; self.view.exclusiveTouch = YES; } -- (void)hideEULA:(BOOL)hide { - //EULA - [self.webview_EULA.scrollView setContentOffset:CGPointMake(0, 0)]; - self.webview_EULA.hidden = hide; - self.img_SeparatorEULA.hidden = hide; -} - - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; @@ -277,9 +227,6 @@ - (void)viewWillAppear:(BOOL)animated { [self.view setUserInteractionEnabled:YES]; self.view.exclusiveTouch = YES; - //EULA - [self hideEULA:YES]; - // Scrolling on keyboard hide and show [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWasShown:) @@ -340,21 +287,8 @@ - (void)setToDefaultProperties { self.tf_Password.text = @""; self.tf_EmailID.accessibilityLabel = nil; self.tf_Password.accessibilityLabel = nil; - - self.lbl_Redirect.text = [Strings redirectText]; - self.lbl_Redirect.isAccessibilityElement = NO; - [self.btn_TroubleLogging setAttributedTitle:[_buttonsTitleStyle attributedStringWithText:[Strings troubleInLoginButton]] forState:UIControlStateNormal]; - [self.btn_TroubleLogging setTitleColor:[[OEXStyles sharedStyles] primaryBaseColor] forState:UIControlStateNormal]; - [self.btn_OpenEULA setTitleColor:[[OEXStyles sharedStyles] primaryBaseColor] forState:UIControlStateNormal]; - _buttonsTitleStyle.weight = OEXTextWeightNormal; - _buttonsTitleStyle.size = OEXTextSizeXXSmall; - - NSString *termsText = [Strings registrationAgreementButtonTitleWithPlatformName:self.environment.config.platformName]; - [self.btn_OpenEULA setAttributedTitle:[_buttonsTitleStyle attributedStringWithText:termsText] forState:UIControlStateNormal]; - self.btn_OpenEULA.titleLabel.adjustsFontSizeToFitWidth = YES; - - self.btn_OpenEULA.accessibilityTraits = UIAccessibilityTraitLink; - self.btn_OpenEULA.accessibilityLabel = [NSString stringWithFormat:@"%@,%@",[Strings redirectText], termsText]; + OEXTextStyle *forgotButtonStyle = [[OEXTextStyle alloc] initWithWeight:OEXTextWeightBold size:OEXTextSizeBase color:[self.environment.styles primaryBaseColor]]; + [self.btn_TroubleLogging setAttributedTitle:[forgotButtonStyle attributedStringWithText:[Strings troubleInLoginButton]] forState:UIControlStateNormal]; [self.btn_Login applyButtonStyleWithStyle:[self.environment.styles filledPrimaryButtonStyle] withTitle:[self signInButtonText]]; [self.activityIndicator stopAnimating]; @@ -385,13 +319,13 @@ - (void)reachabilityDidChange:(NSNotification*)notification { } } -#pragma mark IBActions -- (IBAction)openEULA:(id)sender { - NSURL* url = [[NSBundle mainBundle] URLForResource:@"Terms-and-Services" withExtension:@"htm"]; +#pragma mark AgreementTextViewDelegate +- (void)agreementTextView:(AgreementTextView *)textView didSelect:(NSURL *)url { OEXUserLicenseAgreementViewController* viewController = [[OEXUserLicenseAgreementViewController alloc] initWithContentURL:url]; [self presentViewController:viewController animated:YES completion:nil]; } +#pragma mark IBActions - (IBAction)troubleLoggingClicked:(id)sender { if(self.reachable) { [[UIAlertController alloc] showInViewController:self title:[Strings resetPasswordTitle] message:[Strings resetPasswordPopupText] preferredStyle:UIAlertControllerStyleAlert cancelButtonTitle:[Strings cancel] destructiveButtonTitle:nil otherButtonsTitle:@[[Strings ok]] tapBlock:^(UIAlertController* alertController, UIAlertAction* alertAction, NSInteger buttonIndex) { @@ -534,7 +468,7 @@ - (void)externalLoginWithProvider:(id )provider { [self.view setUserInteractionEnabled:NO]; [self.activityIndicator startAnimating]; - [self.btn_Login applyButtonStyleWithStyle:[self.environment.styles filledPrimaryButtonStyle] withTitle:[[Strings signInButtonTextOnSignIn] oex_uppercaseStringInCurrentLocale]]; + [self.btn_Login applyButtonStyleWithStyle:[self.environment.styles filledPrimaryButtonStyle] withTitle:[Strings signInButtonTextOnSignIn]]; } - (void)loginHandleLoginError:(NSError*)error { diff --git a/Source/OEXLoginViewController.storyboard b/Source/OEXLoginViewController.storyboard index eb2ef2494a..5c23eaf0e3 100644 --- a/Source/OEXLoginViewController.storyboard +++ b/Source/OEXLoginViewController.storyboard @@ -1,14 +1,19 @@ - + - + + + + HelveticaNeue + + @@ -23,7 +28,7 @@ - + @@ -155,7 +160,7 @@ - + - + - - + By signing-in to this app, you agree to the edX End User License Agreement and edX Terms of Service and Honor Code and acknowledge the Privacy Policy. + + + - - - - - - + + + - - - + - + + + + + @@ -274,45 +259,38 @@ + - - - - - - - + + - - - - - + - + - - + + + @@ -340,10 +318,6 @@ - - - - @@ -390,8 +364,10 @@ + + + - @@ -403,7 +379,6 @@ - @@ -414,7 +389,7 @@ - + diff --git a/Source/OEXRegistrationViewController.m b/Source/OEXRegistrationViewController.m index 79f501a2ef..d2af77031b 100644 --- a/Source/OEXRegistrationViewController.m +++ b/Source/OEXRegistrationViewController.m @@ -32,27 +32,21 @@ NSString* const OEXExternalRegistrationWithExistingAccountNotification = @"OEXExternalRegistrationWithExistingAccountNotification"; -@interface OEXRegistrationViewController () +@interface OEXRegistrationViewController () /// Contents are id @property (strong, nonatomic) NSArray* fieldControllers; - @property (strong, nonatomic) IBOutlet UIScrollView* scrollView; - // Used in auth from an external provider @property (strong, nonatomic) UIView* currentHeadingView; @property (strong, nonatomic) id externalProvider; @property (copy, nonatomic) NSString* externalAccessToken; - @property (strong, nonatomic) UIButton* registerButton; -@property (strong, nonatomic) UILabel* agreementLabel; -@property (strong, nonatomic) UIButton* agreementLink; +@property (strong, nonatomic) AgreementTextView* agreementTextView; @property (strong, nonatomic) UIButton* toggleOptionalFieldsButton; @property (strong, nonatomic) UIImageView* optionalFieldsSeparator; @property (strong, nonatomic) UIActivityIndicatorView* progressIndicator; - @property (assign, nonatomic) BOOL isShowingOptionalFields; - @property (strong, nonatomic) OEXRegistrationStyles* styles; @property (strong, nonatomic) OEXTextStyle *toggleButtonStyle; @@ -71,6 +65,7 @@ - (id)initWithEnvironment:(RouterEnvironment *)environment { - (void)viewDidLoad { [super viewDidLoad]; + self.agreementTextView = [[AgreementTextView alloc] init]; self.loadController = [[LoadStateViewController alloc] init]; [self.loadController setupInControllerWithController:self contentView:self.scrollView]; @@ -96,8 +91,7 @@ - (void)viewDidLoad { //set accessibility identifiers for the developer automation use - (void)setAccessibilityIdentifiers { self.registerButton.accessibilityIdentifier = @"RegistrationViewController:register-button"; - self.agreementLabel.accessibilityIdentifier = @"RegistrationViewController:agreement-label"; - self.agreementLink.accessibilityIdentifier = @"RegistrationViewController:agreement-link-button"; + self.agreementTextView.accessibilityIdentifier = @"RegistrationViewController:agreement-text-view"; self.toggleOptionalFieldsButton.accessibilityIdentifier = @"RegistrationViewController:toggle-optional-field-button"; self.optionalFieldsSeparator.accessibilityIdentifier = @"RegistrationViewController:toggle-optional-field-separator-image-view"; self.progressIndicator.accessibilityIdentifier = @"RegistrationViewController:progress-indicator"; @@ -136,8 +130,6 @@ - (void)makeFieldControllers { - (void)initializeViews { - NSString* platform = self.environment.config.platformName; - ////Create and initalize 'btnCreateAccount' button self.registerButton = [[UIButton alloc] init]; @@ -153,27 +145,9 @@ - (void)initializeViews { [self.registerButton addSubview:self.progressIndicator]; [self.progressIndicator hidesWhenStopped]; self.optionalFieldsSeparator = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"separator3"]]; - //Initialize label above agreement view - self.agreementLabel = [[UILabel alloc] init]; - self.agreementLabel.font = [self.environment.styles sansSerifOfSize:10.f]; - self.agreementLabel.textAlignment = NSTextAlignmentCenter; - self.agreementLabel.numberOfLines = 0; - self.agreementLabel.lineBreakMode = NSLineBreakByWordWrapping; - self.agreementLabel.isAccessibilityElement = NO; - self.agreementLabel.text = [Strings registrationAgreementMessage]; - self.agreementLink = [[UIButton alloc] init]; - [self.agreementLink setTitle:[Strings registrationAgreementButtonTitleWithPlatformName:platform] forState:UIControlStateNormal]; - [self.agreementLink.titleLabel setFont:[self.environment.styles semiBoldSansSerifOfSize:10]]; - [self.agreementLink setTitleColor:[UIColor colorWithRed:0.16 green:0.44 blue:0.84 alpha:1] forState:UIControlStateNormal]; - self.agreementLink.accessibilityTraits = UIAccessibilityTraitLink; - self.agreementLink.titleLabel.adjustsFontSizeToFitWidth = YES; - self.agreementLink.titleLabel.textAlignment = NSTextAlignmentCenter; - [self.agreementLink oex_addAction:^(id _Nonnull control) { - [self agreementButtonTapped:nil]; - } forEvents:UIControlEventTouchUpInside]; - self.agreementLink.accessibilityLabel = [NSString stringWithFormat:@"%@ %@",[Strings registrationAgreementMessage],[Strings registrationAgreementButtonTitleWithPlatformName:platform]]; - + [self setUpAgreementTextView]; + //This button will show and hide optional fields self.toggleOptionalFieldsButton = [[UIButton alloc] init]; [self.toggleOptionalFieldsButton setBackgroundColor:[UIColor whiteColor]]; @@ -198,6 +172,19 @@ - (void)initializeViews { } } +-(void) setUpAgreementTextView { + [self.agreementTextView setupFor:AgreementTypeSignUp]; + self.agreementTextView.agreementDelegate = self; + CGSize size = [self.agreementTextView sizeThatFits:CGSizeMake(self.scrollView.frame.size.width - 2 * self.styles.formMargin, CGFLOAT_MAX)]; + self.agreementTextView.frame = CGRectMake(0, 0, size.width, size.height + [[OEXStyles sharedStyles] standardHorizontalMargin]);; +} + +// MARK: AgreementTextViewDelegate +- (void)agreementTextView:(AgreementTextView *)textView didSelect:(NSURL *)url { + OEXUserLicenseAgreementViewController* viewController = [[OEXUserLicenseAgreementViewController alloc] initWithContentURL:url]; + [self presentViewController:viewController animated:YES completion:nil]; +} + - (void)useHeadingView:(UIView*)headingView { [self.currentHeadingView removeFromSuperview]; self.currentHeadingView = headingView; @@ -341,14 +328,9 @@ - (void)viewDidLayoutSubviews { [self.scrollView addSubview:self.registerButton]; offset = offset + 40; - NSInteger buttonLabelSpacing = 10; - - [self.agreementLabel setFrame:CGRectMake(horizontalSpacing, offset + buttonLabelSpacing, width - 2 * horizontalSpacing, 20)]; - [self.scrollView addSubview:self.agreementLabel]; - offset = offset + self.agreementLabel.frame.size.height; - [self.scrollView addSubview:self.agreementLink]; - [self.agreementLink setFrame:CGRectMake(horizontalSpacing, offset, contentWidth, 40)]; - offset = offset + self.agreementLink.frame.size.height; + [self.scrollView addSubview:self.agreementTextView]; + [self.agreementTextView setFrame:CGRectMake(horizontalSpacing, offset + 10, self.agreementTextView.frame.size.width, self.agreementTextView.frame.size.height)]; + offset = offset + self.agreementTextView.frame.size.height + [[OEXStyles sharedStyles] standardHorizontalMargin] * 2; [self.scrollView setContentSize:CGSizeMake(width, offset)]; } diff --git a/Source/PrivacyPolicy.htm b/Source/PrivacyPolicy.htm new file mode 100644 index 0000000000..8134a9a1a8 --- /dev/null +++ b/Source/PrivacyPolicy.htm @@ -0,0 +1,2567 @@ + + + + + + + + + + + + + + + + + + +
+ +

NOTICE: +On May 25, 2018, edX adopted an amended Privacy Policy, providing as follows:

+ +

 

+ +

 

+ +

EdX +and each Member that provides courses through the edX +Site care about the confidentiality and security of your +information. This Privacy Policy applies to information that edX collects +through the edX Site when +you interact with edX, with Members, with other users, and generally with the +edX Site.

+ +

 

+ +

Your +information is received and controlled by edX according to this Privacy Policy +when you sign up for an edX account or otherwise use the edX Site.

+ +

 

+ +

★         EdX is solely and +independently responsible for its own privacy practices. No Member is +responsible for edX’s privacy practices.

+ +

 

+ +

If +you enroll in a course offered by a Member through the edX Site, information +about you and your activity in the course is received and controlled also by +that Member as described in this Privacy Policy.

+ +

 

+ +

★         Each Member is solely +and independently responsible for its own privacy practices. No Member is +responsible for another Member’s privacy practices. Also, edX is not +responsible for any Member’s privacy practices.

+ +

 

+ +

If +you do not accept the terms of this Privacy Policy, then please do not access, +browse, or register for the edX Site or enroll in any courses. If you choose +not to provide certain information required to provide you with various +products and services offered on the edX Site, then you may not be able to +establish a user account or obtain those products or services.

+ +

 

+ +
+ +

Any version of +this Privacy Policy in a language other than English is provided for +convenience and you understand and agree that the English language version will +control if there is any conflict.

+ +
+ +

This Privacy Policy is organized as +follows:

+ +

·       Information that edX collects from you (including +Personal Information)

+ +

·       Cookies and Tracking Technologies on the edX Site

+ +

·       How your information is used

+ +

·       How your information is shared

+ +

·       How to manage your Personal Information

+ +

·       Storage & Security

+ +

·       Privacy Policy updates

+ +

·       Contact +information

+ +

·       Glossary

+ +

 

+ +

INFORMATION +THAT EDX COLLECTS FROM YOU (INCLUDING PERSONAL INFORMATION)

+ +

 

+ +

EdX +directly collects information when you:

+ +

·       sign up for an edX user +account and create an edX user profile;

+ +

·       enroll and participate in +online courses;

+ +

·       purchase a product or service +(for example, Verified Certificates);

+ +

·       send email messages to edX +(including messages to learner support);

+ +

·       participate in user surveys; +and

+ +

·       participate in public forums, +webinars, and other interactive experiences on the edX Site.

+ +

 

+ +

EdX +also indirectly collects usage information about your visit to the edX Site, as +explained in the section below titled Cookies and Tracking Technologies.

+ +

 

+ +

EdX +does not itself collect or store financial account numbers or identification +issued by a governmental entity, employer, or other authority. Instead, if you +choose to make a purchase on the edX Site, for example a Verified Certificate, +you will be directed to edX’s third-party payment processor and edX’s +third-party ID verification service provider. If you do not wish to submit the +required authentication or payment information, then you will not be able to +obtain a certificate via the edX Site.

+ +

 

+ +

EdX +requires your Personal Information only in +limited circumstances when you:

+ +

·       sign up for an edX user +account (name, username, email address);

+ +

·       purchase a Verified +Certificate (so that edX’s third-party vendor can authenticate your identity) +or other product or service (so that edX’s third-party vendor can process +payment);

+ +

·       participate in remote +proctoring or other course facilitation processes (so that edX’s third-party +vendor can monitor and assess the integrity of your course activity); or

+ +

·       earn a Verified Certificate +(the certificate will have your name on it).

+ +

 

+ +

To the extent that edX associates the information that edX +collects directly or indirectly with an individual (for example, you), the +association is based on Personal Information in your account profile.

+ +

 

+ +

You +may voluntarily choose to share additional Personal Information on the edX +Site, for example:

+ +

·       in your edX account profile +(and you may display a limited or full profile to other edX Site users);

+ +

·       in applying for financial +assistance; or

+ +

·       when participating in a +course, forum, webinar, or other interactive experience on the edX Site (noting +that in some cases, this information is shared +with a third party that provides tools or other assistance for the edX Site or +a course).

+ +

 

+ +

EdX encourages you to use discretion +before voluntarily sharing additional Personal Information on the edX Site. (If +you later choose to delete your edX account, deletion of your Personal Information will be subject to the process and limits outlined below.)

+ +

 

+ +

Members do not receive your Personal +Information unless and until you enroll in a course. If you enroll in a course, +the Member that offers the course will receive Personal Information from your +edX account profile plus the information that edX collects about your activity +and performance in the course in which you enrolled.

+ +

 

+ +

COOKIES AND +TRACKING TECHNOLOGIES ON THE EDX SITE

+ + + +

 

+ +

Like +many companies, edX uses Cookies and +other common Tracking Technologies on the edX +Site and in email communications to help edX better understand +your use and needs of the edX Site, current and future edX-related products and +services, and how edX and Members can improve. For example:

+ +

·       based on your cookie +settings, edX tracks information indicating, among other things, which pages of +the edX Site were visited, the order in which they were visited, when they were +visited, and which hyperlinks and other user interface controls were used;

+ +

·       edX may log the IP address, +operating system, and browser software (including mobile use and device type +when you use edX native mobile apps) you used when accessing the edX Site, and +edX may be able to determine from an IP address your Internet Service Provider +and the geographic location of your point of connectivity; and

+ +

·       edX may track and collect +information from emails that edX sends to you, for example whether you opened +the email or clicked on any links from the email.

+ +

 

+ +

EdX +also partners with third parties to help us track and understand your activity +on the edX Site, how you interact with edX’s social media, and how you find or +may be referred to the edX Site. Individual Members may separately use Tracking +Technologies within their courses and email communications to understand your +activity within a course and how you find or may be referred to a course on the +edX Site.

+ +

 

+ +

EdX +and Members use Cookies and other Tracking Technologies for the following +purposes:

+ +

·       when necessary for system +administration, security, and integrity to ensure the edX Site works properly +for you. Without these technologies, the edX Site may not function correctly;

+ +

·       to enable analytics, +performance and functionality, to help edX and Members gather information about +how visitors use the edX Site and monitor edX Site performance, and to enhance +your experience by recognizing and remembering whether you have visited the edX +Site before and may have any personal preferences; and

+ +

·       to support marketing by +enabling edX and Members to deliver content relevant to your interests on the +edX Site and third-party sites based on how you interact with edX or Member +advertisements or content. EdX and Members use “first-party” cookies, which +means cookies served by edX or an individual Member, and also “third-party” +cookies, which means cookies served by third parties that help edX and Members +track this information.

+ +

 

+ +

You +have some options for managing Cookies and other Tracking Technologies. These +include:

+ +

·       Modifying your browser +settings: +You should be able to control how and whether your web browser accepts Cookies +by adjusting its privacy and security settings. The “help” feature of the menu +bar on most browsers will tell you how to stop accepting new Cookies, how to +receive notification of new Cookies, and how to disable existing Cookies. If +you reject edX’s Cookies, many functions and conveniences of the edX Site may +not work properly.

+ +

·       Opting-out of certain +third-party tracking and advertising: Some of the third parties used by edX or a Member +for Cookies and Tracking Technologies offer the ability to opt-out from their +tracking by following processes described on their websites. A list of some +such third parties is maintained and available at the edX learner Help Center and includes, for some, links to +applicable opt-out processes. Neither edX nor any Member is responsible for the +effectiveness of any third-party opt-out options.

+ +

 

+ +

HOW YOUR +INFORMATION IS USED

+ + + +

 

+ +

EdX +and Members use information, including Personal Information, to carry out the following +purposes:

+ +

·       Operate and improve the edX Site – This includes creating and +improving features that support the edX community and enable edX +Site usage at scale. This also includes personalizing the edX +Site, so your learning experience is tailored to your interests and needs.

+ +

·       Create, administer, provide, and teach courses – This includes creating and +improving the delivery of massive open online courses and programs on edX. This +also includes personalizing courses, so your learning experience is tailored to +your interests and needs, and assessing your performance and awarding +certificates.

+ +

·       Offer and improve products and services – This includes enabling you +to navigate the edX Site, to enroll and participate in courses and programs on +the edX Site, to learn effectively in such courses and programs, and to +purchase or obtain products and services on the edX Site such as Verified +Certificates.

+ +

·       Develop and maintain the security and performance of the edX +Site – This +includes tracking edX Site outages and creating software solutions, detecting +violations of the Honor Code and Terms of Service, and monitoring uses, +misuses, and potential misuses of the edX Site.

+ +

·       Communicate with you – This includes answering your course +and platform questions, notifying you of course and edX Site maintenance and +updates, marketing to you about course offerings, programs, news, and related +products and services of edX or edX affiliates, and as permitted under +applicable law, sending you communications about products or services of +selected business partners that may be of interest to you.

+ +

·       Support scientific research including, for example, in the +areas of cognitive science and education – This includes collaborating to +enable and conduct research about how learners access and master course materials +online, with the goal of improving course outcomes.

+ +

·       Track edX Site usage against goals and mission – This includes performing +analytics to evaluate access to and performance in courses and course-related +products and services and to report aggregate usage information (not Personal +Information) to business partners and external audiences.

+ +

·       Exercise, enforce, and comply with legal rights and +obligations +– This includes responding to subpoenas, court orders, or other legal process; +and investigating, preventing, or taking action regarding illegal activities, +suspected fraud, security or technical issues, or to protect the rights, +property, or safety of edX, Members, or others, and as otherwise required by +applicable law.

+ +

 

+ +

EdX +or a Member may also seek your consent for additional uses of information, +including Personal Information, and will use it only for the purpose described +to you. All use of Personal Information is subject to applicable law.

+ +

 

+ +

HOW YOUR INFORMATION IS +SHARED

+ + + +

EdX +and Members share information, including Personal Information, with third parties for the +following purposes:

+ +

·       With service providers, contractors, +and other third parties that help carry out the uses described above – EdX requires third parties +to: (1) abide by this Privacy Policy and applicable law; (2) handle Personal +Information in a confidential manner and maintain adequate security; and (3) +use Personal Information only as needed to fulfill the relevant purpose(s). In +some cases, the edX Site and individual courses are integrated with third-party +services or contain links to websites published by third parties, including +other content providers as well as service providers. These third parties are +responsible for their own privacy practices, so you should pay attention +anytime you are redirected to a third-party website and be sure to review its +privacy policy.

+ +

·       With other learners in courses that you take and with other +visitors to the edX Site, to create an interactive learning environment, +support class participation, and share course information – This includes sharing comments, coursework, or other information +or content that you submit to a portion of the edX Site designed +for viewing by other class members or for public communication. This also +includes providing opportunities for you to communicate with other users who +may have similar interests or educational goals, for instance, recommending +specific study partners or connecting potential student mentees and mentors. In +such cases, edX and each Member that offers a course in which you enrolled may +use all information collected about you to determine who might be interested in +communicating with you, but will only provide others your username (for +clarity, no disclosure of your real name or email address).

+ +

·       With employers, government programs, institutions, or other +enterprises that sponsor your enrollment in a course for training or other +educational purposes – If an entity pays for or otherwise sponsors your Verified Certificate or course participation, edX +will share information with the entity as needed to confirm your enrollment, +participation, progress, and completion status in that course.

+ +

·       With affiliates of edX or a Member, or with successors in the +event of a merger, acquisition, or reorganization, for their use consistent +with this Privacy Policy.

+ +

 

+ +

EdX +or a Member may also seek your consent for additional disclosures of +information, including Personal Information, and will share it only as +described to you. In addition, edX or a Member may share with the public and +with third parties, including but not limited to researchers and business +partners, information and Personal Information that is de-identified or +aggregated in a manner that does not personally identify you.

+ +

 

+ +

HOW TO MANAGE YOUR PERSONAL INFORMATION

+ +

 

+ +

You +can manage your Personal Information through +learner features on the edX Site and +requests to the edX learner support team. If your request involves information +controlled by a Member, edX learner support will notify and coordinate with the +appropriate Member to address your request. EdX will provide support to the +extent required by applicable law (for example, learners in the European Union) +and more broadly when possible, as a courtesy in our sole discretion. EdX will +notify you in the event that edX is unable to meet a request that is not +legally required. Similarly, Members will only be obligated to comply with +requests to the extent legally required, but may choose to comply with other +requests in their sole discretion.

+ +

 

+ +

·       Access and correct your Personal Information

+ +

 

+ +

Much +of your Personal Information is available in your edX account. Your name, email +address, and other identifiable profile information is editable through the +profile settings in your edX account except as noted below. Your account +dashboard lists all current and archived courses in which you have enrolled and +includes links to any Verified Certificates you may +have earned. The dashboard also contains copies of your answers and other +participation and performance in courses. Please contact edX learner support to +access and update this or other information. If your request involves +information controlled by a Member, edX learner support will notify the +appropriate Member of your request.

+ +

 

+ +

Exceptions:

+ +

★         Usernames cannot ever +be changed. This is an edX system restriction. Because usernames identify you +in courses and elsewhere on the edX Site, edX encourages you to use discretion +in choosing your username. If you want to protect your identity, do not use +your real name or a name identifiable to you as your username.

+ +

★         EdX does not track or +index every time or every place on the edX Site when or where a learner may +volunteer Personal Information, so neither edX nor Members will be able to help +you locate or manage all such instances. EdX encourages you to use discretion +before volunteering Personal Information on the edX Site.

+ +

 

+ +

·       Restrict or object to the processing of Personal Information

+ +

 

+ +

If +you want to manage emails and other communications to you, you may update your preferences +in your edX account dashboard, follow the steps described in links at the +bottom of email messages, or contact edX learner support. You may object to, or +request that edX or a Member stop, its use of your Personal Information for +other purposes by contacting the edX learner support team. If your request +involves information controlled by a Member, edX learner support will notify +the appropriate Member of your request. Please note that if you choose to +restrict edX’s or a Member’s ability to process Personal Information, and the +processing is otherwise required to provide you with various services and +products offered on the edX Site, you may not be able to establish an edX user +account or enroll for a course, and edX or a Member may not be able to provide +you with those services or products.

+ +

 

+ +

·       +Delete account and Personal +Information

+ +

 

+ +

To +request deletion of your edX account and Personal Information, please contact +edX learner support. Because deletion on the edX system is a permanent action +and cannot be reversed, edX may ask you to complete a process that aims to +confirm your authority to manage the edX account affected by your request.

+ +

 

+ +

With +respect to your edX account, edX will permanently:

+ +

·       deactivate your edX account,

+ +

·       remove the active profile,

+ +

·       retire your username, and

+ +

·       remove you from edX email +lists.

+ +

 

+ +

With +respect to your Personal Information, edX will permanently delete your edX account profile Personal Information +from the edX Site.

+ +

 

+ +

As noted above, to the extent that edX +associates the information that edX collects directly or indirectly with an +individual (for example, you), the association is based on Personal Information +in your edX account profile. By erasing the Personal Information in your edX +account profile, the remaining information about your activity on the edX Site +will no longer be associated with you, except as noted below.

+ +

 

+ +

These +changes will be applied to data stores that are used for operation of the edX +Site including course administration by Members. If you enrolled in any courses +on the edX Site, the edX learner support team will share your request with the +Members that offered those courses.

+ +

 

+ +

Exceptions:

+ +

★         Deletion will not apply +to historical activity logs or archives unless and until these logs and data +naturally “age-off” the edX system.

+ +

★         EdX does not track or +index every time or every place on the edX Site when or where a learner may +volunteer Personal Information, so neither edX nor Members will be able to help +you locate or manage all such instances. EdX encourages you to use discretion +before voluntarily sharing your Personal Information on the edX Site.

+ +

★         EdX will archive course +data (in a manner and to the extent permitted under applicable law) to serve +its mission to enable scientific research on cognitive science and education. +These archives are used to produce encrypted research data packages for +Members, and Personal Information may not be deleted from research data +packages retained by Members.

+ +

★         EdX and each applicable +Member cannot always delete records of past interactions and transactions. For +example, records relating to previous purchases on the edX Site must be +retained for financial reporting, audit, and compliance reasons.

+ +

★         EdX and each Member +will retain and use Personal Information as necessary to comply with its legal +obligations, resolve disputes, enforce its agreements, and as otherwise +permitted by applicable law.

+ +

 

+ +

·       Data Retention

+ +

 

+ +

EdX +will retain your Personal Information for as long as your account is active or +as needed to provide you with services; to maintain a record of your +transactions for financial reporting, audit, and compliance purposes; and to +comply with edX’s legal obligations, resolve disputes, enforce its agreements, +and as otherwise permitted by applicable law. If you enroll in a Member’s +course, such Member will also retain your Personal Information for as long as +needed to provide you with services; to maintain a record of your transactions +for financial reporting, audit, and compliance purposes; and to comply with its +legal obligations, resolve disputes, enforce its agreements, and as otherwise +permitted by applicable law. Upon your request that edX deactivate your account +and delete your information, edX will follow the process described above, +including without limitation archiving your course data (in a manner and to the +extent permitted under applicable law) to serve its mission to enable +scientific research on cognitive science and education. These archives will be +used to produce encrypted research data packages for Members, and each such +Member may also keep and use course data for scientific research.

+ +

 

+ +

STORAGE & SECURITY

+ + + +

 

+ +

EdX +stores information, including Personal +Information, on its own servers and also on servers of companies that edX hires to +provide services. Each Member also stores information, +including Personal Information, on its own servers and/or on servers of +companies that the Member hires to provide services. In each case, information +may be stored in the United States and in other countries where edX or a Member +operates, and in countries where edX and each Member’s respective service +providers operate. If you are in the European Union, Switzerland, or other +regions with laws governing data collection and use, you acknowledge that edX +and each Member may transfer, process and store your personal information in +the United States and other countries, the privacy laws of which may be +considered less strict than those of your region.

+ +

 

+ +

EdX +controls its own copy of information collected through the edX +Site +and has an information security program designed to protect information in its +possession or control. This is done through a variety of privacy and security +policies, processes, and procedures. EdX uses administrative, physical, and +technical safeguards that reasonably and appropriately protect the +confidentiality, integrity, and availability of the information that it +collects, receives, stores, or transmits. Nonetheless, no method of +transmission over the Internet, or method of electronic storage, is 100% +secure; and therefore, edX cannot guarantee its absolute security. While edX +works hard to ensure the integrity and security of its network and systems, edX +cannot guarantee that its security measures will prevent “hackers” or other +unauthorized persons from illegally accessing or obtaining information.

+ +

 

+ +

If +edX learns of a security breach involving its copy of your Personal +Information, edX may attempt to notify you electronically so that you may take +appropriate protective steps. By using the edX Site or providing Personal Information to edX, you agree that +edX can communicate with you electronically regarding security, privacy, and +administrative issues relating to your use of the edX Site. If a security +systems breach occurs, edX may post a notice on the edX homepage (www.edx.org) +or elsewhere on the edX Site and may send an email to you at the email address +associated with your edX account. Depending on where you are located, you may +have a legal right to receive notice of a security breach, involving your +Personal Information, in writing.

+ +

 

+ +

If a +Member learns of a security breach involving that Member’s copy of your +Personal Information, the Member may attempt to notify you electronically so +that you may take appropriate protective steps. By enrolling in a Member’s +course on the edX Site or +providing Personal Information to the Member, you agree that the Member can +communicate with you electronically regarding security, privacy, and +administrative issues relating to your course enrollment and participation. If +a security systems breach occurs, the affected Member may post a notice on the +edX site and/or send an email to you at the email address associated with your +enrollment in the Member’s course on the edX Site. Depending on where you are +located, you may have a legal right to receive notice of a security breach, +involving your Personal Information, in writing.

+ +

 

+ +

PRIVACY POLICY UPDATES

+ + + +

This Privacy Policy will be reviewed and updated from +time to time. When changes are made, the Privacy Policy will be labeled as +"Revised (date)," indicating that you should review the new terms, +which will be effective immediately upon posting on this page, with an updated +effective date. By accessing the edX Site after any changes have been +made, you accept the modified Privacy Policy and any changes contained therein. +In case you miss the notification referenced above, be sure to return to this +page periodically to ensure familiarity with the most current version of this +Privacy Policy.

+ +

CONTACT INFORMATION

+ + + +

 

+ +

If +you have privacy concerns, have disclosed data you would prefer to keep +private, or would like to access the Personal Information that edX maintains +about you, please contact us at privacy@edx.org. You may also write to us +at: edX Inc., ATTN: PRIVACY, edX Inc., 141 Portland Street, Cambridge, MA 02139 +USA. If your request involves a Member, edX will notify the appropriate Member +of your request.

+ +

 

+ +

GLOSSARY

+ + + +

 

+ +

Cookies are +unique identifiers usually in the form of small data files placed on your +device that send certain information about your activity on the edX Site or in +an email communication back to edX or the authorized third party that served +the cookie. EdX or third parties may also use Flash cookies.

+ +

EdX Site consists +of all content and pages located within the edX.org web domain and all edX +mobile applications.

+ +

Member is +each educational institution or other leading global institution or entity that +provides courses through the edX Site.

+ +

Personal +Information is information that specifically +identifies you or that, when combined with other information, could be used to +identify you.

+ +

Tracking +Technologies are web beacons, clear gifs, pixels, +and similar technologies that are also unique identifiers used to track your +online activity but are not stored on your device.

+ +

Verified +Certificate is a virtual certificate that shows +that you have successfully completed your edX course or program and verified +your identity using your webcam and your acceptable form of photo ID.

+ +

 

+ +

Effective Date: May 25, 2018

+ +
+ + + + diff --git a/Source/Terms-and-Services.htm b/Source/Terms-and-Services.htm deleted file mode 100644 index 512c8547a3..0000000000 --- a/Source/Terms-and-Services.htm +++ /dev/null @@ -1,1923 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -
- - -

END USER LICENSE AGREEMENT

- -

 

- -

 

- - -

THE EDX APPLICATION (the Application) AND INCLUDED INFORMATION, -DOCUMENTS, IMAGES, VIDEOS, DATA, LECTURES, NOTES, AND OTHER MATERIALS, IN ALL -FORMATS AND MEDIUMS (COLLECTIVELY, THE CONTENT) -ARE PROVIDED BY EDX, INC. (EDX). 

- -

 

- -

BY INSTALLING AND USING THIS APPLICATION, YOU ARE -AGREEING TO BE BOUND BY THE TERMS AND CONDITIONS SET FORTH IN THIS END USER -LICENSE AGREEMENT (EULA), INCLUDING THE TERMS OF SERVICE AND HONOR CODE , AND THE EDX PRIVACY - POLICY  (WITH THE EULA AND PRIVACY -POLICY REFERRED TO COLLECTIVELY -AS THE AGREEMENT).  IF YOU DO NOT AGREE, YOU ARE -PROHIBITED FROM USING THIS APPLICATION.

- -

 

- -

AS USED IN THIS AGREEMENT, \D2YOU\D3 OR \D2YOUR\D3 REFERS -TO THE PERSON OR ENTITY WHO DOWNLOADS AND USES THE APPLICATION AND CONTENT.  ADDITIONALLY, EDX and You are referred to collectively as the \D2Parties\D3 and -individually as a \D2Party.\D3

- -

 

- - - -

YOUR RIGHT -TO USE THE APPLICATION AND CONTENT SHALL TERMINATE IMMEDIATELY UPON THE FIRST -TO OCCUR OF YOUR NONCOMPLIANCE WITH THE AGREEMENT, OR UNINSTALLATION OF THE -APPLICATION FROM YOUR MOBILE DEVICE.

- -

 

- -

CERTAIN -VERSIONS OF THIS APPLICATION REQUIRE REGISTRATION AND COURSE ENROLLMENT AS -DESCRIBED IN THIS AGREEMENT.  BY -USING THIS APPLICATION AND THE CONTENT, YOU HEREBY COVENANT TO EDX THAT YOU ARE -PROPERLY REGISTERED TO PARTICIPATE IN THE RELEVANT COURSE(S), PER THE -REQUIREMENTS SET FORTH IN SECTION B BELOW.

- -

 

- -

A.         APPLICATION -AND CONTENT

- -

YOUR USE -OF THE APPLICATION AND CONTENT SHALL CONSTITUTE YOUR UNDERSTANDING OF, AND -AGREEMENT TO THE AGREEMENT (AND RATIFICATION OF ANY PREVIOUS CONSENT MADE BY -YOU).

- -

 

- -

1.   OWNERSHIP OF THE APPLICATION & CONTENT.  The Application and Content are the -copyrighted work of edX and/or its licensors and suppliers.  You agree that the Application and -Content contain proprietary and copyright protected material and, the design -and structure of the Application as well as the compilation of the Content each -contain valuable trade secrets and copyrighted material and other intellectual -property rights exclusively owned by edX and its licensors.  You acknowledge and agree that as -between You and edX, edX is and shall remain the sole and excusive owner of all -rights, title, and interest in and to the Application and the Content, -including any patents, copyrights, trade secrets, and any other intellectual -and industrial property rights related thereto.  You acknowledge and agree not to take -any action inconsistent with such ownership. If You create any derivative works -in violation of this Agreement based, in whole or in part, on the Application -or the Content, You shall and hereby do assign all rights, title, and interest -in and to such derivative works free and clear of any liens, claims, or -encumbrances to edX.

- -

2.   GRANT OF LICENSE.  edX grants You a personal, -limited, non-exclusive, non-transferable, revocable license to (i) install and -use the Application in object code form on a single mobile device; and (ii) use -the Content, including any updates and enhancements, only on Your mobile device, -and subject to the terms and conditions found in the Agreement (the License).  Except as otherwise expressly provided, edX -grants no other express or implied rights to You in regard to the Application -or the Content. 

- -

3.   RESTRICTIONS -ON USE OF APPLICATION & CONTENT.

- -

(a)  The -License granted to You may not be sublicensed, commercially distributed, or -shared with any third party without the prior written consent of edX.  Except as otherwise granted hereunder, -You shall not:  (i) copy, -distribute, reproduce, rent, lend, loan, or sublicense any portion of the -Application or Content; (ii) translate, adapt, modify, alter, or combine the -Application or Content with other applications or software, materials, or -prepare derivative works based in whole or in part, on the Application or -Content; (iii) use the Application or Content in a computer-based services -business; (iv) following the initial download, transmit the Application over a -network, by telephone, or electronically using any means; or (v) reverse -engineer, decompile, disassemble, or otherwise reduce the Application or any of -its subcomponents to a human-perceivable form.

- -

      Subject to the foregoing, Content may -be viewed in offline sync mode, as well as within the Application; however, You -may not share or use Content except as necessary for participation in the -related course for which your are registered.  All Content will be deleted upon -uninstallation of the Application to the extent the same has been downloaded to -your device.

- -

(b)  To the -extent You contribute Content via the Application, the following shall be -prohibited:

- -

- - •       - Content -that defames, harasses or threatens others; - -

- -

•       Content -that discusses illegal activities with the intent to commit them;

- -

•       Content -that infringes another's intellectual property, including, but not limited to, -copyrights or trademarks;

- -

•       Profane, -pornographic, obscene, indecent or unlawful content;

- -

•       Advertising -or any form of commercial solicitation;

- -

•       Content -related to partisan political activities;

- -

•       Viruses, -trojan horses, worms, time bombs, corrupted files, malware, spyware or any -other similar software that may damage the operation of another's computer or -property; and

- -

•       -Content that contains intentionally inaccurate -information or that is posted with the intent of misleading others.

- -

(c)  You agree -not to misrepresent or attempt to misrepresent Your identity while using the Application -(although You are welcome and encouraged to use an anonymous username in the -forums and to act in a manner that keeps Your identity concealed).

- -

4.   Additional Application/Services.  edX -may, in its sole discretion, develop and deliver or offer updates, supplements, -add-on components, product support services, or Internet-based service components -(collectively Supplemental Components) -for the Application from time to time.  -The terms of the Agreement shall apply to Supplement Components that You -may obtain from edX or an edX -Application supplier.  For -purposes of the balance of the provisions contained in the Agreement, the -Supplemental Components shall be deemed included in the term \D2Application.\D3

- -

5.   EQUITABLE -REMEDIES AND ENFORCEMENT.  You acknowledge and agree that Your -breach of any of the obligations set forth in Sections A(1), A(2), A(3), A(9), -B(1) through B(5), and C of this Agreement shall cause edX irreparable injury -and shall entitle edX to equitable relief or remedy.  The pursuit or securing of any such -equitable relief shall not prohibit or limit edX from seeking or obtaining any -other remedy provided under this Agreement or by law.  If any or all of the above covenants or -agreements are held to be unenforceable because of the scope or duration of -such covenant or agreement or the area covered thereby, the Parties agree that -the court making such determination shall have the power to reduce the scope, -duration and area of such covenant or agreement to the extent that allows the -maximum scope, duration and area permitted by applicable law.  The covenants, agreements and remedies -provided herein are in addition to, and are not to be construed as a -replacement for or limited by, the rights and remedies otherwise available to edX -including, but not limited to, those rights and remedies contained in the -Uniform Trade Secrets Act, or its state counterparts.

- -

6.   Disclaimer of -Warranty.  YOU EXPRESSLY ACKNOWLEDGE AND AGREE THAT -USE OF THE APPLICATION AND CONTENT IS AT YOUR SOLE RISK AND THAT THE ENTIRE -RISK AS TO SATISFACTORY QUALITY, PERFORMANCE, ACCURACY AND EFFORT IS WITH YOU. EDX -AND ITS LICENSORS, AGENTS, OFFICERS, DIRECTORS, EMPLOYEES, SUCCESSORS, ASSIGNS, -AFFILIATES, AND MEMBERS PROVIDE THE APPLICATION AND CONTENT \D2AS IS WITH ALL -FAULTS\D3 WITHOUT WARRANTY OF ANY KIND, AND EDX ON BEHALF OF ITSELF AND ITS -LICENSORS AND EACH MEMBER HEREBY EXPRESSLY DISCLAIMS ANY EXPRESS OR IMPLIED -WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, -SATISFACTORY QUALITY, AND NON-INFRINGEMENT.  EDX DOES NOT WARRANT AGAINST -INTERFERENCE WITH YOUR ENJOYMENT OF THE APPLICATION AND CONTENT, THAT THE -FUNCTIONS CONTAINED IN THE APPLICATION WILL MEET YOUR REQUIREMENTS, THAT THE -APPLICATION IS FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS, THAT THE OPERATION -OF THE APPLICATION WILL BE UNINTERRUPTED OR ERROR-FREE, THAT DEFECTS IN THE -APPLICATION WILL BE CORRECTED, OR THAT THE FUNCTIONS CONTAINED IN THE -APPLICATION WILL FUNCTION WITH OTHER SOFTWARE OR HARDWARE, OR WITHIN A -PARTICULAR SYSTEM.  NO ORAL OR -WRITTEN INFORMATION OR ADVICE GIVEN BY EDX, A MEMBER, OR AN EDX AUTHORIZED -REPRESENTATIVE SHALL CREATE A WARRANTY. SHOULD THE APPLICATION PROVE DEFECTIVE, -YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR, OR CORRECTION. -SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES OR -LIMITATIONS ON APPLICABLE STATUTORY RIGHTS OF A CONSUMER, SO THE ABOVE -EXCLUSION MAY NOT APPLY TO YOU.

- -

7.   Limitation of Liability.  TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW AND REGARDLESS OF WHETHER -ANY REMEDY FAILS OF ITS ESSENTIAL PURPOSE,  IN NO EVENT SHALL EDX OR ITS LICENSORS, AGENTS, -OFFICERS, DIRECTORS, EMPLOYEES, SUCCESSORS, ASSIGNS, AFFILIATES OR MEMBERS BE -LIABLE  FOR PERSONAL INJURY, OR ANY -INCIDENTAL, SPECIAL, INDIRECT, CONSEQUENTIAL, OR PUNITIVE DAMAGES, WHATSOEVER, INCLUDING, WITHOUT LIMITATION, DAMAGES -FOR LOSS OF PROFITS, LOST TIME, LOST SAVINGS, -LOSS OF DATA, DAMAGED DATA, INACCURATE DATA, FAILURE OF TELECOMMUNICATION SERVICES, -LOST CONFIDENTIAL OR OTHER -INFORMATION, OR FOR BUSINESS INTERRUPTION OR ANY OTHER COMMERCIAL -DAMAGES OR LOSSES ARISING -OUT OF OR RELATED TO YOUR USE OR INABILITY TO USE THE APPLICATION OR CONTENT, -HOWEVER CAUSED, REGARDLESS OF THE THEORY OF LIABILITY (TORT, CONTRACT OR -OTHERWISE) AND EVEN IF EDX HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -SOME JURISDICTIONS DO NOT ALLOW THE LIMITATION OF LIABILITY FOR PERSONAL -INJURY, OR OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS LIMITATION MAY NOT -APPLY TO YOU.  THE FOREGOING -LIMITATIONS WILL APPLY EVEN IF THE ABOVE STATED REMEDY FAILS OF ITS ESSENTIAL -PURPOSE.

- -

8.   Indemnification.  You -agree to indemnify, hold harmless, and defend edX, its licensors, agents, -officers, directors, employees, successors, assigns, affiliates, and Members, -from and against any action, cause, claim, damage, debt, demand or liability, -including reasonable costs and attorneys\D5 fees, asserted by any person, arising -out of or relating to the breach of this Agreement.

- -

9.   EXPORT - RESTRICTIONS.  You acknowledge that the -Application is of U.S. origin, and agree to comply with all applicable -international and national laws that apply to the Application, including the -U.S. Export Administration Regulations, as well as end-user, end-use and -country destination restrictions issued by the U.S. and other governments.

- -

10.  Government -End Users.  If You are -acquiring the Application on behalf of any unit or agency of the United States -Government, it is provided to the Government only with restricted rights and -limited rights.  Use, duplication, -or disclosure by the Government is subject to restrictions set forth in FAR -Sections 52-227-14 and 52-227-19 or DFARS Section 52.227-7013(C)(1)(ii), as -applicable.  The Application and -Application documentation, if any, are "Commercial Items," as that -term is defined at 48 C.F.R. \A42.101, consisting of "Commercial Computer -Application" and "Commercial Computer Application -Documentation," as such terms are used in 48 C.F.R. \A41 2.21 2 or 48 C.F.R. -\A4227.7202, as applicable.

- -

11.  TERMINATION.  Without prejudice to any other -rights, edX may terminate this Agreement if You fail to comply with the -terms and conditions of the Agreement.  -In such event, You must immediately remove the Application from Your mobile -device including all of its -component parts.

- -

12.  Entire Agreement.  The -Agreement constitutes the entire agreement between the Parties related to the -Application and Content and supersedes any and all prior and contemporaneous -oral or written understandings between the Parties relating to the subject -matter hereof.

- -

13.  Modification and Waiver.  edX shall have the right to modify the -terms and conditions of this Agreement without prior notice to You.  Any waiver shall be limited to the -circumstance or event specifically referenced in the written waiver document -and shall not be deemed a waiver of any other term in this Agreement or of the -same circumstance or event upon any recurrence thereof.

- -

14.  BINDING EFFECT.  This Agreement shall be -binding upon and inure to the benefit of the Parties\D5 respective successors or -assigns.

- -

15.  Validity.  If any part of this Agreement is -determined to be invalid or unenforceable by a court of competent jurisdiction -or by any other legal constituted body having the jurisdiction to make such -determination, the remainder of this Agreement shall remain in full force and -effect.

- -

16.  Governing Law and Jurisdiction.  This Agreement -shall be deemed to have been made in the Commonwealth of Massachusetts and shall be governed by, construed, and interpreted in -accordance with the laws of the Commonwealth of Massachusetts.  With respect -to any dispute, controversy, or claim arising out of or relating to this Agreement -or the relationship between the Parties, the Parties agree and consent to -jurisdiction of and exclusive venue in the United States District Court, -District of Massachusetts, Boston Division or in the Boston Municipal Court.  The Agreement shall not be governed by -the United Nations Convention on Contracts for the International Sale of Goods, -the application of which is hereby expressly excluded.  You hereby expressly waive Your right to -trial by jury.

- -

17.  Third-Party -Beneficiaries.  Use of -the Application and Content is for Your personal benefit.  This Agreement does not  confer any rights to any other person or -entity as a third-party beneficiary or otherwise.

- -

18.  Headings.  The headings of this Agreement are for -the purpose of reference only and shall not in any way limit or affect the -meaning or interpretation of any of the terms hereof.

- -

19.  DATE.  This Agreement was last updated on February -19, 2015.

- -

 

- - - - -

B.   TERMS -OF SERVICE AND HONOR CODE; REGISTRATION

- -

On October -22, 2014, edX adopted amended Terms of Service (TOS), which apply to use of the edX web site located at www.edx.org (Site).  Certain -provisions contained in the TOS as set forth below apply to user registration -and participation in edX service offerings, access to course material, chat -rooms, or other electronic services made available to You via this Application. -  USE OF THE SITE IS GOVERNED -BY THE TOS AND YOU SHOULD REVIEW THE TOS CAREFULLY PRIOR TO USING THE SITE.

- -

1.   USER ACCOUNT AND -AUTHORITY.  In order to use this Application, You must provide Your -name, an email address and a user password in order to create a user account (User Account). You agree that you will -never divulge or share access or access information for Your User Account with -any third party for any reason. In setting up Your User Account, You may be -prompted to enter additional optional information (e.g., your address). You represent that all information provided by -You is accurate and current. You agree to maintain and update your information -to keep it accurate and current.  We care about the confidentiality and -security of your personal information. Please see our Privacy Policy   for more -information about the information about You edX collects and how edX uses that -information.

- -

2.   CERTIFICATES.  

- -

(a)  Generally. edX and -the colleges, universities and other institutions providing courses (collectively, -the Members) may offer a certificate -of achievement or other acknowledgment (a Certificate) -for students who, in their judgment, have satisfactorily demonstrated mastery -of the course material. Certificates will be issued by edX under the name of -the underlying Member from where the course originated, i.e. HarvardX, MITx, etc. The decision whether a Certificate will -be awarded to a given student will be solely within the discretion of the -awarding Member. edX and/or the Members providing courses may choose not to -offer a Certificate for some courses.

- -

(b)  Registration and Payment. -Subject to the foregoing, You may be required to pay a fee to receive an -ID Verified Certificate of Achievement (a Verified - Certificate) with respect to certain courses, in which case, the following processes -and requirements shall apply:

- -

•        -As part of Your registration, You will be prompted -to submit a photo of Yourself, along with one other form of photo -identification (photo ID). Although -these items are collected by edX in accordance with these TOS and the edX Privacy - Policy  , You -should be aware that the actual authentication of Your identify is performed by -an edX third party service provider. Please refer to the Privacy Policy  for -additional details on how we handle those items once received by us.

- -

•        -In addition, the processing of Your payment -information is done by an edX third party vendor, and You will be re-routed to -a secure website to complete the payment transaction. The privacy -statement  posted at the payment landing -page operated by such third party vendor will govern the submission and -processing of Your payment details. Please familiarize Yourself with those -terms prior to initiating a transaction.

- -

•        -Once Your payment transaction is completed, You -will be re-routed back to an edX confirmation page and will receive a -confirmation email with Your name, order number and the payment amount. Please -retain this email for Your records as this information will be required if You -seek a refund from edX, as described below.

- -

(c)  Course Withdrawal and -Refunds. For a period of fourteen (14) calendar days from the course start date -(Drop Period), You may withdraw or -unregister from the course by clicking on the unregister link on the student -dashboard and request a refund by emailing billing@edx.org. Please include Your full -name and order number in Your email request. Refunds will be credited to the -credit card used when You registered and may take up to two (2) billing cycles -to process. edX has no obligation to issue a refund after the Drop Period, but -if You believe a refund is warranted, please email us at billing@edx.org.

- -

3.   NO OTHER ENROLLMENT.  When -You take a course through edX, You will not be an applicant for admission to, -or enrolled in, any degree program of the Member as a result of registering for -or completing a course provided by such Member through edX. You will not be -entitled to use any of the resources of the Member beyond the online courses -provided via this Application, nor will You be eligible to receive student -privileges or benefits provided to students enrolled in degree programs of the -Member.

- -

4.   AUTHENTICATION.  In -order that edX can authenticate Your identity as required by this Agreement, You -will be prompted to take a photo of Yourself, as well as a photo of an -acceptable form of photo ID (described below). PLEASE NOTE: SOME APPLICATIONS DO NOT INCLUDE THIS FUNCTIONALITY.  IF YOU DO NOT AUTHENTICATE YOUR - IDENTITY, CERTAIN SERVICES MAY NOT BE AVAILABLE TO YOU.  Once submitted to edX, this -information will be subject to the edX Privacy Policy   and will -be used only for the purpose of verifying Your identity. Acceptable forms of -photo ID\D5s are:

- -

•        -Government or State-issued driver\D5s license

- -

•        -Passport

- -

•        -National ID card

- -

•        -State or Province ID card (including cards issued -by motor vehicle agencies) 

- -

In order to be accepted by -edX, Your photo ID must:

- -

•        -Contain Your full name exactly (excluding hyphens, -accents and spaces)

- -

•        -Contain a relatively current photograph of Yourself

- -

•        -Be current and valid; expired documents cannot be -accepted

- -

Unfortunately, if you do not posses a photo ID -meeting the criteria described above, edX is unable to provide you with an ID -Verified Certificate at this time.

- -

5.   EDX HONOR CODE -PLEDGE

- -

(a)  COLLABORATION POLICY.  By -enrolling in a course on edX, You are joining a special worldwide community of -learners. The aspiration of edX is to provide anyone in the world who has the -motivation and ability to engage coursework from the Massachusetts Institute of -Technology, Harvard University and the other Members providing courses the -opportunity to attain the best educational experience that internet technology -enables. You are part of the community who will help edX achieve this goal.  edX depends upon Your motivation to -learn the material and to do so with honesty. In order to participate in edX, You -must agree to the Honor Code below and any additional terms specific to a -class. This Honor Code, and any additional terms, will be posted on each class -website.

- -

(b)  EDX HONOR CODE PLEDGE.  By -enrolling in an edX course, You agree that You will:

- -

•        -Complete all mid-terms and final exams with Your -own work and only Your own work. You will not submit the work of any other -person.

- -

•        -Maintain only one user account and not let anyone -else use Your username and/or password.

- -

•        -Not engage in any activity that would dishonestly -improve Your results, or improve or hurt the results of others.

- -

•        -Not post answers to problems that are being used to -assess student performance.

- -

Unless otherwise indicated by the instructor of an -edX course, learners on edX are encouraged to:

- -

•        -Collaborate with others on the lecture videos, -exercises, homework and labs.

- -

•        -Discuss with others general concepts and materials -in each course.

- -

•        -Present ideas and written work to fellow edX -learners or others for comment or criticism.

- -

(c)  CHANGING THE HONOR CODE.  Please -note that edX reviews and may make changes to this Honor Code from time to -time.  Any changes to this Honor Code will be effective immediately upon the -issuance of an updated Agreement.

- -
- - - - \ No newline at end of file diff --git a/Source/TermsOfServices.htm b/Source/TermsOfServices.htm new file mode 100644 index 0000000000..ce58157a31 --- /dev/null +++ b/Source/TermsOfServices.htm @@ -0,0 +1,2588 @@ + + + + + + + + + + + + + + + + + + +
+ +
+ +

On May 25, 2018, +edX adopted amended Terms of Service, providing as follows:

+ +

 

+ +

Welcome to edX. Please read these Terms of Service +("TOS") and Honor Code prior to registering for an account on edX.org +or using any portion of the edX website or mobile applications (collectively, the +"edX Site," which consists of all content and pages located within +the edX.org web domain and all edX mobile applications), including accessing +any course material, chat rooms, or other electronic services. These TOS and +the Honor Code that follows are agreements (the +"Agreements") between you and edX Inc. By using the edX Site, you +accept and agree to be legally bound by the Agreements, whether or not you are +a registered user. Please also read the Privacy Policy for the edX Site before you use any +portion of the edX Site. The Privacy Policy describes how your personal data is +collected and processed when you use the edX Site. If you do not understand or +do not wish to be bound by the terms of the Agreements or Privacy Policy, you +should not use the edX Site.

+ +

 

+ +

EdX reserves the right to modify these TOS at any time +without advance notice. Any changes to these TOS will be effective immediately +upon posting on this page, with an updated effective date. By accessing the edX +Site after any changes have been made, you signify your agreement on a +prospective basis to the modified TOS and all of the changes. Be sure to return +to this page periodically to ensure familiarity with the most current version +of these TOS.

+ +

 

+ +

Any version of these +TOS in a language other than English is provided for convenience and you +understand and agree that the English language version will control if there is +any conflict.

+ +
+ +

These TOS are organized as follows:

+ +

●      Rules for online conduct

+ +

●      Strictly prohibited items

+ +

●      User accounts

+ +

●      Your right to use content on the edX +Site

+ +

●      User postings

+ +

●      Certificates and other products +& services

+ +

●      Trademarks

+ +

●      Digital Millennium Copyright +Act

+ +

●      Disclaimers of Warranty / Limitations +of Liabilities

+ +

●      Indemnification

+ +

●      Additional Terms

+ +
+ +

 

+ +

RULES FOR ONLINE CONDUCT

+ + + +

 

+ +

You agree that you are responsible for your own use of +the edX Site and for your User Postings. "User Postings" means all +content submitted, posted, published, or distributed on the edX Site by you or +other users of the edX Site, including but not limited to all forum posts, wiki +edits, notes, questions, comments, videos, and file uploads. You agree that you +will use the edX Site in compliance with these Agreements, and all applicable +local, state, national and international laws, rules and regulations, including +copyright laws, any laws regarding the transmission of technical data exported +from your country of residence, and all United States export control laws.

+ +

 

+ +

As a condition of your use of the edX Site, you will not +use the edX Site in any manner intended to damage, disable, overburden, or +impair any edX server or the network(s) connected to any edX server or to +interfere with any other party's use and enjoyment of the edX Site. You may not +attempt to gain unauthorized access to the edX Site, other accounts, computer +systems, or networks connected to any edX server through hacking, password +mining, or any other means. You may not obtain or attempt to obtain any +materials or information stored on the edX Site, its servers, or associated +computers through any means not intentionally made available through the edX +Site.  If you are a registered user, you +will not share your password or let anyone else access or compromise your +account.

+ +

 

+ +

Furthermore, you agree not to scrape, or otherwise +download in bulk, any edX Site content, including but not limited to a list or +directory of users on the system, User Postings or user information, online +textbooks, course materials, or trademarks and logos. You agree not to +misrepresent or attempt to misrepresent your identity while using the edX Site +(although you are welcome and encouraged to use an anonymous username in the +forums and to act in a manner that keeps your identity concealed).

+ +

 

+ +

STRICTLY PROHIBITED ITEMS

+ +

 

+ +

THE FOLLOWING ITEMS ARE STRICTLY PROHIBITED ON THE EDX +SITE:

+ +
+ +
+ +

●      +Content that defames, harasses, or threatens others;

+ +

●      +Content that discusses illegal activities with the intent to commit +them;

+ +

●      +Content that infringes another's intellectual property, including, but +not limited to, copyrights or trademarks;

+ +

●      +Profane, pornographic, obscene, indecent, or unlawful content;

+ +

●      +Advertising or any form of commercial solicitation;

+ +

●      +Content related to partisan political activities;

+ +

●      +Viruses, trojan horses, worms, time bombs, corrupted files, malware, spyware, +or any other similar software that may damage the operation of another's +computer or property; and

+ +

●      +Content that contains intentionally inaccurate information or that is +posted with the intent of misleading others (this list, collectively, “Strictly +Prohibited Items”).

+ +
+ +
+ +

You may not submit, post, publish, share, or otherwise +distribute any of the above Strictly Prohibited Items on or via the edX Site.

+ +

 

+ +

USER ACCOUNTS

+ +

 

+ +

In order to create a user account, you must provide your +full name, an email address, your country or region of residence, a public +username, and a user password. You agree that you will never divulge or share +access or access information for your user account with any third party for any +reason. In setting up your user account, you may be prompted to enter +additional optional information (e.g., your year of birth). You represent that +all information provided by you is accurate and current. You agree to maintain +and update your information to keep it accurate and current.

+ +

 

+ +

We care about the confidentiality and security of your +personal information. Please see the Privacy Policy for more information about the +collection and use of data on the edX Site.

+ +

 

+ +

YOUR RIGHT TO USE CONTENT ON THE EDX SITE

+ +

 

+ +

Unless indicated as being in the public domain, the +content on the edX Site is protected by United States and foreign copyright +laws. Unless otherwise expressly stated on the edX Site, the texts, exams, +video, images, and other instructional materials provided with the courses +offered on the edX Site are for your personal use in connection with those +courses only. We aim to make much of the edX course content available under +more open license terms that will help create a vibrant ecosystem of contributors +and further edX's goal of making education accessible and affordable to the +world.

+ +

 

+ +

Certain reference documents, digital textbooks, articles, +and other information on the edX Site are used with the permission of third +parties, and use of that information is subject to certain rules and +conditions, which will be posted along with the information. By using the edX +Site, you agree to abide by all such rules and conditions.

+ +

 

+ +

You agree to retain all copyright and other notices on +any content you obtain from the edX Site. All rights in the edX Site and its +content, if not expressly granted, are reserved.

+ +

 

+ +

Use for +Personalization and Pedagogical Improvements.  +Our goal is to provide current and future visitors to the edX Site with +the best possible educational experience. To further this goal, we sometimes +present different users with different versions of course materials and +software. We do this to personalize the experience to the individual learner +(to assess the learner’s level of ability and learning style, and present +materials best suited to the learner), to improve our understanding of the +learning process, and to evaluate and improve the effectiveness of our course +materials, payment models, platform features, and offerings. We may publish or +otherwise publicize results from this process, but, unless otherwise permitted +under the Privacy +Policy, those publications +or public disclosures will not include your personal information.

+ +

 

+ +

USER POSTINGS

+ +

 

+ +

User Postings +Representations and Warranties.  By submitting or +distributing your User Postings, you affirm, represent, and warrant (1) that +you have the necessary rights, licenses, consents, and/or permissions to +reproduce and publish the User Postings and to authorize edX and its users to +reproduce, modify, publish, and otherwise use and distribute your User Postings +in a manner consistent with the licenses granted by you below, and (2) that +neither your submission of your User Postings nor the exercise of the licenses +granted below will infringe or violate the rights of any third party. You, and +not edX, are solely responsible for your User Postings and the consequences of +posting or publishing them.

+ +

 

+ +

License Grant to +edX.  By submitting or distributing your User +Postings, you hereby grant to edX a worldwide, non-exclusive, transferable, +assignable, sub licensable, fully paid-up, royalty-free, perpetual, irrevocable +right and license to host, transfer, display, perform, reproduce, modify, +distribute, redistribute, relicense, and otherwise use, make available, and +exploit your User Postings, in whole or in part, in any form and in any media +formats and through any media channels (now known or hereafter developed).

+ +

 

+ +

License Grant to +edX Users.  By submitting or distributing your User +Postings, you hereby grant to each user of the edX Site a non-exclusive license +to access and use your User Postings in connection with their use of the edX +Site for their own personal purposes.

+ +

 

+ +

CERTIFICATES AND OTHER +PRODUCTS & SERVICES

+ +

 

+ +

Generally.  From time to time, edX and the colleges, +universities, and other institutions providing courses and programs on the edX +Site (collectively, the "Members") may offer services and products +for a fee (for example, course and program certificates). For anything that you +choose to purchase on the edX Site, you agree to pay all applicable fees when +due. As described in the Privacy Policy, the processing of your payment +information is done by a third-party payment vendor, and you will be routed to +a secure payment flow controlled by that vendor to complete the payment +transaction. Once your payment transaction is completed, an edX confirmation +page will be displayed, and you will receive a confirmation email with your +name, order number, and the payment amount. Please retain this email for your +records as this information will be required if you seek a refund from edX, as +described below.

+ +

 

+ +

Certificates.  EdX and the Members may offer ID Verified +Certificates of Achievement for courses (a "Verified Certificate") or +certificates for programs (for example, a MicroMasters program certificate) for +learners who, in the Members’ judgment, have satisfactorily demonstrated +mastery of the course or program material. Certificates will be issued by edX +under the name of the underlying Member(s) from where the course or program +originated, i.e. HarvardX, MITx, etc. The decision whether a certificate will +be awarded to a given learner will be solely within the discretion of the +awarding Member.

+ +

 

+ +

Subject to the foregoing, you will be required to pay a +fee and complete the ID verification process for Verified Certificates. In +order to authenticate your identity for a Verified Certificate, you will be +prompted to take a webcam photo of yourself, as well as a photo of an +acceptable form of photo ID (described below). Although these items are +collected by edX in accordance with these TOS and the Privacy Policy, you should be aware that the actual +authentication of your identity is performed by an edX third-party service +provider and this information will be used only for the purpose of verifying +your identity. Acceptable forms of photo ID’s are:

+ +
+ +
+ +

●      +Government or State-issued driver’s license

+ +

●      +Passport

+ +

●      +National ID card

+ +

●      +State or Province ID card (including cards issued by motor vehicle +agencies)

+ +
+ +
+ +

In order to be accepted by edX, your photo ID must:

+ +
+ +
+ +

●      +Contain your full name exactly (excluding hyphens, accents, and spaces);

+ +

●      +Contain a relatively current photograph of yourself;

+ +

●      +Be an original document; photocopied documents cannot be accepted; and

+ +

●      +Be current and valid; expired documents cannot be accepted.

+ +
+ +
+ +

Unfortunately, if you do not possess a photo ID meeting +the criteria described above, edX is unable to provide you with a Verified +Certificate at this time.

+ +

 

+ +

Refunds. Certificates and other +purchases on the edX Site may be eligible for a refund for a period of time (in +each case, the “Refund Period”). The applicable Refund Period for some products +and services are described below. To request a refund for a purchase that you +made, please email us at billing@edx.org and include your full name and order +number in your email request. Refunds will be credited to the credit card used +for the purchase and may take up to two billing cycles to process. If the +applicable Refund Period for a purchase has passed, but you believe a refund is +warranted, please email us at billing@edx.org.

+ +
+ +
+ +

●      +Verified Certificate Track: For enrollment in the verified +certificate track of a course, you have a period of 14 days after your payment +or 14 days after your course starts (up to 60 days after your payment) +whichever occurs later, during which you may withdraw or unenroll from the +course by clicking on the unenroll link on the learner dashboard and request a +refund by emailing billing@edx.org.

+ +

●      +Professional Education +Courses: For +enrollment in a Professional Education course, you have a period of 2 days +after your payment or 2 days after the course starts (up to 60 days after your +payment) whichever occurs later to unenroll from the course by clicking on the +unenroll link on the learner dashboard and request a refund by emailing billing@edx.org.

+ +
+ +
+ +

For more information about refund options (for example, +changing to another course session), you should visit the edX Help Center.

+ +

 

+ +

Coupon codes and other course entitlements are subject to +expiration and any other conditions stated at the time of purchase.

+ +

 

+ +

No Other +Enrollment.  You will not be an applicant for admission +to, or enrolled in, any degree or other credit- or credential-bearing program +of the Member as a result of registering for or completing a course or program +provided by such Member through edX. You will not be entitled to use any of the +resources of the Member beyond the online courses or programs provided on the +edX Site, nor will you be eligible to receive student privileges or benefits +provided to students enrolled in degree or other credit- or credential-bearing +programs of the Member.

+ +

 

+ +

TRADEMARKS

+ +

 

+ +

Use of edX, MIT, +Harvard University, and Other Member Names, Trademarks, and Service Marks.  The "edX," "MIT," and +"Harvard University" names, logos and seals are trademarks +("Trademarks") of the respective entities. Likewise, the names, +logos, and seals of the other Members are Trademarks owned by the respective +Member. You may not use any of these Trademarks, or any variations thereof, +without the owner's prior written consent. You may not use any of these +Trademarks, or any variations thereof, for promotional purposes, or in any way +that deliberately or inadvertently claims, suggests or, in the owner’s sole +judgment, gives the appearance or impression of a relationship with or +endorsement by the owner.

+ +

 

+ +

All Trademarks not owned by edX or the Members that +appear on the edX Site or on or through the services made available on or +through the edX Site, if any, are the property of their respective owners.

+ +

 

+ +

Nothing contained on the edX Site should be construed as +granting, by implication, estoppel, or otherwise, any license or right to use +any Trademark displayed on the edX Site without the written permission of the +owner of the applicable Trademark.

+ +

 

+ +

DIGITAL MILLENNIUM COPYRIGHT +ACT

+ +

 

+ +

Copyright owners who believe their material has been infringed +on the edX Site should contact edX's designated copyright agent at +dmca-agent@edx.org or at edX Inc., 141 Portland St., Cambridge, MA 02139, +Attention: edX DMCA Agent/General Counsel.

+ +

 

+ +

Notification must include:

+ +
+ +
+ +

●      +Identification of the copyrighted work, or, in the case of multiple +works at the same location, a representative list of such works at that site.

+ +

●      +Identification of the material that is claimed to be infringing or to be +the subject of infringing activity. You must include sufficient information for +us to locate the material (e.g., URL, IP address, computer name).

+ +

●      +Information for us to be able to contact the complaining party (e.g., +email address, phone number).

+ +

●      +A statement that the complaining party believes that the use of the +material has not been authorized by the copyright owner or an authorized agent.

+ +

●      +A statement that the information in the notification is accurate and +that the complaining party is authorized to act on behalf of the copyright +owner.

+ +
+ +
+ +

DISCLAIMERS OF WARRANTY / LIMITATIONS OF LIABILITIES

+ +

 

+ +

THE EDX SITE AND +ANY INFORMATION, CONTENT OR SERVICES MADE AVAILABLE ON OR THROUGH THE EDX SITE +ARE PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF +ANY KIND (EXPRESS, IMPLIED OR OTHERWISE), INCLUDING, WITHOUT LIMITATION, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND +NON-INFRINGEMENT, EXCEPT INSOFAR AS ANY SUCH IMPLIED WARRANTIES MAY NOT BE +DISCLAIMED UNDER APPLICABLE LAW.

+ +

 

+ +

EDX AND THE EDX +PARTICIPANTS (AS HEREINAFTER DEFINED) DO NOT WARRANT THAT THE EDX SITE WILL +OPERATE IN AN UNINTERRUPTED OR ERROR-FREE MANNER, THAT THE EDX SITE IS FREE OF +VIRUSES OR OTHER HARMFUL COMPONENTS, OR THAT THE COURSES OR CONTENT PROVIDED +WILL MEET YOUR NEEDS OR EXPECTATIONS. EDX AND THE EDX PARTICIPANTS ALSO MAKE NO +WARRANTY ABOUT THE ACCURACY, COMPLETENESS, TIMELINESS, OR QUALITY OF THE EDX +SITE OR ANY COURSES OR CONTENT, OR THAT ANY PARTICULAR COURSES OR CONTENT WILL +CONTINUE TO BE MADE AVAILABLE. “EDX PARTICIPANTS” MEANS MIT, HARVARD, THE OTHER +MEMBERS, THE ENTITIES PROVIDING INFORMATION, CONTENT, OR SERVICES FOR THE EDX +SITE, THE COURSE INSTRUCTORS, AND THEIR STAFFS.

+ +

 

+ +

USE OF THE EDX +SITE, AND THE CONTENT AND SERVICES OBTAINED FROM OR THROUGH THE EDX SITE, IS AT +YOUR OWN RISK. YOUR ACCESS TO OR DOWNLOAD OF INFORMATION, MATERIALS, OR DATA +THROUGH THE EDX SITE OR ANY REFERENCE SITES IS AT YOUR OWN DISCRETION AND RISK, +AND YOU WILL BE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR PROPERTY (INCLUDING +YOUR COMPUTER SYSTEM) OR LOSS OF DATA THAT RESULTS FROM THE DOWNLOAD OR USE OF +SUCH MATERIAL OR DATA, UNLESS OTHERWISE EXPRESSLY PROVIDED FOR IN THE PRIVACY POLICY.

+ +

 

+ +

User Postings +Disclaimer.  You understand that when using the edX Site +you will be exposed to User Postings from a variety of sources and that neither +edX nor the edX Participants are responsible for the accuracy, usefulness, +reliability or intellectual property rights of or relating to such User +Postings. You further understand and acknowledge that you may be exposed to +User Postings that are inaccurate, offensive, defamatory, indecent or +objectionable and you agree to waive, and hereby do waive, any legal or +equitable rights or remedies you have or may have against edX or any of the edX +Participants with respect thereto. Neither edX nor any of the edX Participants +endorse any User Postings or any opinion, recommendation or advice expressed +therein. Neither edX nor any of the edX Participants have any obligation to +monitor any User Postings or any other user communications through the edX +Site.

+ +

 

+ +

However, edX reserves the right to review User Postings +and to exercise its sole discretion to edit or remove, in whole or in part, any +User Posting at any time and for any reason, or to allow the edX Participants +to do so. Without limiting the foregoing, upon receiving notice from a user or +a content owner that a User Posting allegedly does not conform to these TOS, +edX may investigate the allegation and determine in its sole discretion whether +to remove the User Posting, which it reserves the right to do at any time and +without notice.

+ +

 

+ +

Links to Other +Websites.  The edX Site may include hyperlinks to +websites maintained or controlled by others. EdX and the edX Participants are +not responsible for and do not routinely screen, approve, review or endorse the +contents of or use of any of the products or services that may be offered at +these websites. If you decide to access linked third-party websites, you do so +at your own risk.

+ +

 

+ +

TO THE FULLEST +EXTENT PERMITTED BY APPLICABLE LAW, YOU AGREE THAT NEITHER EDX NOR ANY OF THE +EDX PARTICIPANTS WILL BE LIABLE TO YOU FOR ANY LOSS OR DAMAGES, EITHER ACTUAL +OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO THESE TERMS OF SERVICE, OR YOUR +(OR ANY THIRD PARTY'S) USE OF OR INABILITY TO USE THE EDX SITE, OR YOUR +PLACEMENT OF CONTENT ON THE EDX SITE, OR YOUR RELIANCE UPON INFORMATION +OBTAINED FROM OR THROUGH THE EDX SITE, WHETHER YOUR CLAIM IS BASED IN CONTRACT, +TORT, STATUTORY OR OTHER LAW.

+ +

 

+ +

IN PARTICULAR, +TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, NEITHER EDX NOR ANY OF THE +EDX PARTICIPANTS WILL HAVE ANY LIABILITY FOR ANY CONSEQUENTIAL, INDIRECT, +PUNITIVE, SPECIAL, EXEMPLARY, OR INCIDENTAL DAMAGES, WHETHER FORESEEABLE OR +UNFORESEEABLE AND WHETHER OR NOT EDX OR ANY OF THE EDX PARTICIPANTS HAS BEEN +NEGLIGENT OR OTHERWISE AT FAULT (INCLUDING, BUT NOT LIMITED TO, CLAIMS FOR +DEFAMATION, ERRORS, LOSS OF PROFITS, LOSS OF DATA, OR INTERRUPTION IN +AVAILABILITY OF DATA).

+ +

 

+ +

CERTAIN STATE +LAWS DO NOT ALLOW LIMITATIONS ON IMPLIED WARRANTIES OR THE EXCLUSION OR +LIMITATION OF CERTAIN DAMAGES. IF THESE LAWS APPLY TO YOU, SOME OR ALL OF THE +ABOVE DISCLAIMERS, EXCLUSIONS, OR LIMITATIONS MAY NOT APPLY TO YOU, AND YOU +MIGHT HAVE ADDITIONAL RIGHTS.

+ +

 

+ +

INDEMNIFICATION

+ +

 

+ +

You agree to defend, hold harmless, and indemnify edX and +the edX Participants, and their respective subsidiaries, affiliates, officers, +faculty, students, fellows, governing board members, agents and employees from +and against any third-party claims, actions, or demands arising out of, +resulting from or in any way related to your use of the edX Site, including any +liability or expense arising from any and all claims, losses, damages (actual +and consequential), suits, judgments, litigation costs, and attorneys' fees, of +every kind and nature. In such a case, edX or the applicable edX Participant +will provide you with written notice of such claim, suit, or action.

+ +

 

+ +

ADDITIONAL TERMS

+ +

 

+ +

Termination +Rights; Discontinuation of Courses and Content.  +You agree that edX, in its sole discretion, may terminate your use of +the edX Site or your participation in it, for any reason or no reason, upon +notice to you. It is edX's policy to terminate in appropriate circumstances the +accounts of users of the edX Site who are repeat copyright infringers. EdX and +the edX Participants reserve the right at any time in their sole discretion to +cancel, delay, reschedule or alter the format of any course offered through +edX, or to cease providing any part or all of the edX Site content or related +services, and you agree that neither edX nor any of the edX Participants will +have any liability to you for such an action. If you no longer desire to +participate in the edX Site, you may terminate your participation at any time. +The rights granted to you hereunder will terminate upon any termination of your +right to use the edX Site, but the other provisions of the Agreements will +survive any such termination.

+ +

 

+ +

Entire Agreement.  The Agreements constitute the entire +agreement between you and edX with respect to your use of the edX Site, +superseding any prior agreements between you and edX regarding your use of the +edX Site.

+ +

 

+ +

Waiver and +Severability.  The failure of edX to exercise or enforce any +right or provision of the Agreements shall not constitute a waiver of such +right or provision. If any provision of the Agreements is found by a court of +competent jurisdiction to be invalid, the parties nevertheless agree that the +court should endeavor to give effect to the parties' intentions as reflected in +the provision and the other provisions of the Agreements shall remain in full +force and effect.

+ +

 

+ +

Choice of +Law/Forum Selection.  You agree that the Agreements +and any claim or dispute arising out of or relating to the Agreements or any +content or service obtained from or through the edX Site will be governed by +the laws of the Commonwealth of Massachusetts, excluding its conflicts of law +provisions. You agree that all such claims and disputes will be heard and +resolved exclusively in the federal or state courts located in and serving +Cambridge, Massachusetts, U.S.A. You consent to the personal jurisdiction of +those courts over you for this purpose, and you waive and agree not to assert +any objection to such proceedings in those courts (including any defense or +objection of lack of proper jurisdiction or venue or inconvenience of forum).

+ +
+ +

Effective +Date: May 25, 2018.

+ +

 

+ +

HONOR CODE

+ +

 

+ +

Collaboration Policy.  By enrolling in a course on edX, you are joining a +special worldwide community of learners. The aspiration of edX is to provide +anyone with an internet connection access to courses from the best universities +and institutions in the world and to provide our learners the best educational +experience internet technology enables. You are a part of the community that +will help edX achieve this goal. EdX depends upon your motivation to learn the +material and to do so with honesty and academic integrity. In order to +participate in edX, you must agree to the Honor Code below and any additional +terms specific to a course or program. This Honor Code, and any additional terms, +will be posted on each course website.

+ +

 

+ +

Honor Code Pledge.  By enrolling in an edX course or program, I agree that I +will:

+ +

●      +Complete all tests and assignments on my own, unless collaboration on an +assignment is explicitly permitted.

+ +

●      +Maintain only one user account and not let anyone else use my username +and/or password.

+ +

●      +Not engage in any activity that would dishonestly improve my results, or +improve or hurt the results of others.

+ +

●      +Not post answers to problems that are being used to assess learner +performance.

+ +

 

+ +

Violations.  If you are found in violation of the Terms of Service or +Honor Code, you may be subject to one or more of the following actions:

+ +

●      +Receiving a zero or no credit for an assignment;

+ +

●      Having any certificate earned +in the course or program withheld or revoked;

+ +

●      Being unenrolled from a course +or program; or

+ +

●      Termination of your use of the +edX Site.

+ +

●      Additional actions may be +taken at the sole discretion of edX and edX Member course providers.

+ +

No refunds will be issued in the case +of any corrective action for such violations.

+ +

 

+ +

Honor code violations will be determined at the sole +discretion of edX Members. You will be notified if a determination has been +made that you have violated this honor code and you will be informed of the +corresponding action to be taken as a result of the violation.

+ +

 

+ +

Changing the +Honor Code.  Please note that we review and may +make changes to this Honor Code from time to time. Any changes to this Honor +Code will be effective immediately upon posting on this page, with an updated +effective date. By accessing the edX Site after any changes have been made, you +signify your agreement on a prospective basis to the modified Honor Code and +any changes contained therein. Be sure to return to this page periodically to +ensure familiarity with the most current version of this Honor Code.

+ +

 

+ +

Effective Date: May 25, 2018.

+ +

 

+ +
+ + + + diff --git a/Source/en.lproj/Localizable.strings b/Source/en.lproj/Localizable.strings index db97898f92..2f8671c4a1 100644 --- a/Source/en.lproj/Localizable.strings +++ b/Source/en.lproj/Localizable.strings @@ -156,6 +156,18 @@ "ADD_RESPONSE"="Add response"; /* Add your post button title used in discussion's add a post textview */ "ADD_YOUR_POST"="Add your post"; +/*Agreement text*/ +"AGREEMENT.TEXT"="you agree to the {eula} and {tos} and acknowledge the {privacy_policy}."; +/*Agreement text prefix for user on signin screen*/ +"AGREEMENT.TEXT_PREFIX_SIGNIN"="By signing-in to this app, "; +/*Agreement text prefix for user on signup screen*/ +"AGREEMENT.TEXT_PREFIX_SIGNUP"="By creating an account, "; +/*Link Text for End Use License Agreement*/ +"AGREEMENT.LINK_TEXT_EULA"="{platform_name} End User License Agreement"; +/*Link Text for End Use License Agreement*/ +"AGREEMENT.LINK_TEXT_TOS"="{platform_name} Terms of Service and Honor Code"; +/*Link Text for End Use License Agreement*/ +"AGREEMENT.LINK_TEXT_PRIVACY_POLICY"="Privacy Policy"; /* Alert dialog button allowing user to chosing to allow downloads on cellular */ "ALLOW"="Allow"; /* Filtering option to show all discussion posts */ @@ -393,7 +405,7 @@ /* Error message when user is not enrolled to any course and course discovery is also disabled.*/ "ENROLLMENT_LIST.NO_ENROLLMENT" = "It looks like you are not enrolled in any courses yet."; /* Prompt indicating user needs to enter an email address */ -"ENTER_EMAIL"="Please enter your user name or e-mail address and try again."; +"ENTER_EMAIL"="Please enter your username or e-mail address and try again."; /* Prompt indicating user needs to enter a password */ "ENTER_PASSWORD"="Please enter your password and try again."; /* Text used when the post is visible to everyone */ @@ -441,7 +453,7 @@ /* Overlay error shown when logging in with an invalid email address */ "INVALID_EMAIL_MESSAGE"="Please make sure your e-mail address is formatted correctly and try again."; /* Overlay error shown when logging in with an invalid username or password */ -"INVALID_USERNAME_PASSWORD"="Please make sure that your user name or e-mail address and password are correct and try again."; +"INVALID_USERNAME_PASSWORD"="Please make sure that your username or e-mail address and password are correct and try again."; /* Alert dialog text asking whether it's okay to download large videos */ "LARGE_DOWNLOAD_MESSAGE"="The videos you've selected are larger than 1 GB. Do you want to download these videos?"; /* Alert dialog title when asking whether it's okay to download large videos */ @@ -582,14 +594,10 @@ "RECENT_ACTIVITY" = "Recent Activity"; /* Section title to display recently downloaded videos */ "RECENT_VIDEOS"="Recent Videos"; -/* Create account agreement. Followed by agreement name like "End User License Agreement */ -"REDIRECT_TEXT" = "By signing in to this app, you agree to the"; /* Label before Sort and Filter buttons on Posts Screen ( The Colon(:) is part of the string) */ "REFINE" = "Refine:"; /* Button title when responses are closed for a thread */ "RESPONSES_CLOSED"="Responses are closed for this post"; -/* Title of registration agreement */ -"REGISTRATION_AGREEMENT_BUTTON_TITLE"="{platform_name} Terms of Service and Honor Code"; /* Create account agreement. Followed by list of agreement names like "End User License Agreement" */ "REGISTRATION_AGREEMENT_MESSAGE"="By creating an account, you agree to the "; /* Button text allowing user create an account */ @@ -718,7 +726,7 @@ /* Placeholder title for course content with no title */ "UNTITLED"="Untitled"; /* Hint text for login field */ -"USERNAME_PLACEHOLDER" = "User name or e-mail address"; +"USERNAME_PLACEHOLDER" = "Username or e-mail address"; /*Error message when operation failed with unknow error*/ "UNKNOWN_ERROR" = "Your action could not be completed."; /* Screen title showing a user's account */ diff --git a/Source/es-419.lproj/Localizable.strings b/Source/es-419.lproj/Localizable.strings index 49147e43e2..be43f84bf3 100644 --- a/Source/es-419.lproj/Localizable.strings +++ b/Source/es-419.lproj/Localizable.strings @@ -156,6 +156,18 @@ "ADD_RESPONSE"="Añadir respuesta"; /* Add your post button title used in discussion's add a post textview */ "ADD_YOUR_POST"="Añadir su publicación"; +/*Agreement text*/ +"AGREEMENT.TEXT"="you agree to the {eula} and {tos} and acknowledge the {privacy_policy}."; +/*Agreement text prefix for user on signin screen*/ +"AGREEMENT.TEXT_PREFIX_SIGNIN"="By signing-in to this app, "; +/*Agreement text prefix for user on signup screen*/ +"AGREEMENT.TEXT_PREFIX_SIGNUP"="By creating an account, "; +/*Link Text for End Use License Agreement*/ +"AGREEMENT.LINK_TEXT_EULA"="{platform_name} End User License Agreement"; +/*Link Text for End Use License Agreement*/ +"AGREEMENT.LINK_TEXT_TOS"="{platform_name} Terms of Service and Honor Code"; +/*Link Text for End Use License Agreement*/ +"AGREEMENT.LINK_TEXT_PRIVACY_POLICY"="Privacy Policy"; /* Alert dialog button allowing user to chosing to allow downloads on cellular */ "ALLOW"="Permitir"; /* Filtering option to show all discussion posts */ @@ -582,14 +594,10 @@ "RECENT_ACTIVITY" = "Actividad reciente"; /* Section title to display recently downloaded videos */ "RECENT_VIDEOS"="Videos recientes"; -/* Create account agreement. Followed by agreement name like "End User License Agreement */ -"REDIRECT_TEXT" = "Al iniciar sesión en esta app, está aceptando los "; /* Label before Sort and Filter buttons on Posts Screen ( The Colon(:) is part of the string) */ "REFINE" = "Refinar:"; /* Button title when responses are closed for a thread */ "RESPONSES_CLOSED"="Las respuestas ya están cerradas para esta publicación"; -/* Title of registration agreement */ -"REGISTRATION_AGREEMENT_BUTTON_TITLE"="Términos del servicio y Código de honor de {platform_name}"; /* Create account agreement. Followed by list of agreement names like "End User License Agreement" */ "REGISTRATION_AGREEMENT_MESSAGE"="Al crear una cuenta, usted acepta los "; /* Button text allowing user create an account */ diff --git a/Test/OEXRegistrationViewControllerTests.swift b/Test/RegistrationViewControllerTests.swift similarity index 96% rename from Test/OEXRegistrationViewControllerTests.swift rename to Test/RegistrationViewControllerTests.swift index 846f2a1b68..abb878890a 100644 --- a/Test/OEXRegistrationViewControllerTests.swift +++ b/Test/RegistrationViewControllerTests.swift @@ -1,5 +1,5 @@ // -// OEXRegistrationViewControllerTests.swift +// RegistrationViewControllerTests.swift // edX // // Created by Akiva Leffert on 2/5/16. @@ -9,7 +9,7 @@ import XCTest @testable import edX -class OEXRegistrationViewControllerTests: SnapshotTestCase { +class RegistrationViewControllerTests: SnapshotTestCase { func testAnalyticsEmitted() { let environment = TestRouterEnvironment() diff --git a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios8_380x568@2x.png b/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios8_380x568@2x.png deleted file mode 100644 index 0866e747f2..0000000000 Binary files a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios8_380x568@2x.png and /dev/null differ diff --git a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios8_rtl_380x568@2x.png b/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios8_rtl_380x568@2x.png deleted file mode 100644 index 641feb8b08..0000000000 Binary files a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios8_rtl_380x568@2x.png and /dev/null differ diff --git a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios10_380x568@2x.png b/Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios10_380x568@2x.png similarity index 100% rename from Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios10_380x568@2x.png rename to Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios10_380x568@2x.png diff --git a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios10_rtl_380x568@2x.png b/Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios10_rtl_380x568@2x.png similarity index 100% rename from Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios10_rtl_380x568@2x.png rename to Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios10_rtl_380x568@2x.png diff --git a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios9_380x568@2x.png b/Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios9_380x568@2x.png similarity index 100% rename from Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios9_380x568@2x.png rename to Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios9_380x568@2x.png diff --git a/Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios9_rtl_380x568@2x.png b/Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios9_rtl_380x568@2x.png similarity index 100% rename from Test/Snapshots/edXTests.OEXRegistrationViewControllerTests/testSnapshotContent_ios9_rtl_380x568@2x.png rename to Test/Snapshots/edXTests.RegistrationViewControllerTests/testSnapshotContent_ios9_rtl_380x568@2x.png diff --git a/edX.xcodeproj/project.pbxproj b/edX.xcodeproj/project.pbxproj index 82f8c28c5f..d7e0b8d5c3 100644 --- a/edX.xcodeproj/project.pbxproj +++ b/edX.xcodeproj/project.pbxproj @@ -16,8 +16,6 @@ 1904A14E1A1386C2006A5524 /* VideoData.m in Sources */ = {isa = PBXBuildFile; fileRef = 1904A1431A1386C2006A5524 /* VideoData.m */; }; 1904A14F1A1386C2006A5524 /* ResourceData.m in Sources */ = {isa = PBXBuildFile; fileRef = 1904A1461A1386C2006A5524 /* ResourceData.m */; }; 1904A1511A1386C2006A5524 /* OEXStorageFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 1904A14A1A1386C2006A5524 /* OEXStorageFactory.m */; }; - 1905BFF11A31B037001917FA /* COURSE_NOT_LISTED.htm in Resources */ = {isa = PBXBuildFile; fileRef = 1905BFF01A31B037001917FA /* COURSE_NOT_LISTED.htm */; }; - 1905BFF31A31B097001917FA /* NEW_USER.htm in Resources */ = {isa = PBXBuildFile; fileRef = 1905BFF21A31B097001917FA /* NEW_USER.htm */; }; 1913DD3D194B267000573977 /* OEXDownloadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1913DD3C194B267000573977 /* OEXDownloadViewController.m */; }; 1913DD4419502E5D00573977 /* OEXVideoSummary.m in Sources */ = {isa = PBXBuildFile; fileRef = 1913DD4319502E5D00573977 /* OEXVideoSummary.m */; }; 1918AFAE1948357700F40345 /* OEXLastAccessedTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 1918AFAD1948357700F40345 /* OEXLastAccessedTableViewCell.m */; }; @@ -39,7 +37,6 @@ 199B9B751935E35D00081A09 /* OEXHelperVideoDownload.m in Sources */ = {isa = PBXBuildFile; fileRef = 199B9B741935E35D00081A09 /* OEXHelperVideoDownload.m */; }; 19A1339419CAAC21003ADD24 /* OEXClosedCaptionTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 19A1339219CAAC21003ADD24 /* OEXClosedCaptionTableViewCell.m */; }; 19A1339519CAAC21003ADD24 /* OEXClosedCaptionTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19A1339319CAAC21003ADD24 /* OEXClosedCaptionTableViewCell.xib */; }; - 19A1339719CAE108003ADD24 /* EULA.htm in Resources */ = {isa = PBXBuildFile; fileRef = 19A1339619CAE108003ADD24 /* EULA.htm */; }; 19BB622A1A9B28F1007DBF47 /* OEXRegistrationFieldWrapperView.m in Sources */ = {isa = PBXBuildFile; fileRef = 19BB62291A9B28F1007DBF47 /* OEXRegistrationFieldWrapperView.m */; }; 19BB62301A9C656B007DBF47 /* OEXMySettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 19BB622E1A9C656B007DBF47 /* OEXMySettingsViewController.m */; }; 19BB62311A9C656B007DBF47 /* OEXMySettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 19BB622F1A9C656B007DBF47 /* OEXMySettingsViewController.xib */; }; @@ -417,7 +414,7 @@ 778F177E1C0E049B0099BF93 /* CourseCatalogViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778F177D1C0E049B0099BF93 /* CourseCatalogViewControllerTests.swift */; }; 778F17831C0E06640099BF93 /* TestRouterEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778F17811C0E06480099BF93 /* TestRouterEnvironment.swift */; }; 778F17851C10A1B50099BF93 /* CourseCatalogDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 778F17841C10A1B50099BF93 /* CourseCatalogDetailViewController.swift */; }; - 7791C4ED1C651E9D0005745B /* OEXRegistrationViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7791C4EC1C651E9D0005745B /* OEXRegistrationViewControllerTests.swift */; }; + 7791C4ED1C651E9D0005745B /* RegistrationViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7791C4EC1C651E9D0005745B /* RegistrationViewControllerTests.swift */; }; 7793764D1BED27D000900A8C /* BasicAuthCredential.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7793764C1BED27D000900A8C /* BasicAuthCredential.swift */; }; 7793764F1BED404C00900A8C /* OEXConfig+URLCredentialProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7793764E1BED404C00900A8C /* OEXConfig+URLCredentialProvider.swift */; }; 779376551BF15A8F00900A8C /* OEXConfig+URLCredentialProviderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 779376541BF15A8F00900A8C /* OEXConfig+URLCredentialProviderTests.swift */; }; @@ -592,7 +589,7 @@ B419295E1A8A3F1900448AD5 /* OEXNetworkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B419295D1A8A3F1900448AD5 /* OEXNetworkManager.m */; }; B41F22BB1A113D3D0022E01F /* OEXDownloadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B41F22BA1A113D3D0022E01F /* OEXDownloadManager.m */; }; B42DA1891A1539F000E3AD4E /* OEXFileUtility.m in Sources */ = {isa = PBXBuildFile; fileRef = B42DA1881A1539F000E3AD4E /* OEXFileUtility.m */; }; - B47780591AADA95400436DB4 /* Terms-and-Services.htm in Resources */ = {isa = PBXBuildFile; fileRef = B47780581AADA95400436DB4 /* Terms-and-Services.htm */; }; + B47780591AADA95400436DB4 /* TermsOfServices.htm in Resources */ = {isa = PBXBuildFile; fileRef = B47780581AADA95400436DB4 /* TermsOfServices.htm */; }; B4A24D0D19EE8A6600CE5010 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B4A24D0C19EE8A6600CE5010 /* CoreMedia.framework */; }; B4B285D91A9A48D500DD603A /* OEXGoogleConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = B4B285D81A9A48D500DD603A /* OEXGoogleConfig.m */; }; B4B285DC1A9A490400DD603A /* OEXFacebookConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = B4B285DB1A9A490400DD603A /* OEXFacebookConfig.m */; }; @@ -631,6 +628,9 @@ B78823A81FC6F69900F9CD61 /* RegistrationFieldController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B78823A71FC6F69900F9CD61 /* RegistrationFieldController.swift */; }; B78823AC1FC709BD00F9CD61 /* String+Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B78823AB1FC709BD00F9CD61 /* String+Validation.swift */; }; B78823B01FC80CBB00F9CD61 /* RegistrationFieldControllerFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = B78823AF1FC80CBB00F9CD61 /* RegistrationFieldControllerFactory.swift */; }; + B78B233C20908A5100F8D976 /* PrivacyPolicy.htm in Resources */ = {isa = PBXBuildFile; fileRef = B78B233A20908A5000F8D976 /* PrivacyPolicy.htm */; }; + B78B233D20908A5100F8D976 /* MobileAppEula.htm in Resources */ = {isa = PBXBuildFile; fileRef = B78B233B20908A5000F8D976 /* MobileAppEula.htm */; }; + B78B233F20908C3D00F8D976 /* AgreementTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B78B233E20908C3D00F8D976 /* AgreementTextView.swift */; }; BD3838541DD1CA7E00805697 /* OEXFontsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD3838531DD1CA7E00805697 /* OEXFontsTests.swift */; }; BD7C6C3E1DCA32370004D135 /* OEXFonts.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD7C6C3D1DCA32360004D135 /* OEXFonts.swift */; }; BD7C6C401DCA329A0004D135 /* fonts.json in Resources */ = {isa = PBXBuildFile; fileRef = BD7C6C3F1DCA329A0004D135 /* fonts.json */; }; @@ -796,8 +796,6 @@ 1904A1471A1386C2006A5524 /* OEXDBManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXDBManager.h; sourceTree = ""; }; 1904A14A1A1386C2006A5524 /* OEXStorageFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEXStorageFactory.m; sourceTree = ""; }; 1904A14B1A1386C2006A5524 /* OEXStorageFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXStorageFactory.h; sourceTree = ""; }; - 1905BFF01A31B037001917FA /* COURSE_NOT_LISTED.htm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = COURSE_NOT_LISTED.htm; sourceTree = ""; }; - 1905BFF21A31B097001917FA /* NEW_USER.htm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = NEW_USER.htm; sourceTree = ""; }; 1913DD3B194B267000573977 /* OEXDownloadViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXDownloadViewController.h; sourceTree = ""; }; 1913DD3C194B267000573977 /* OEXDownloadViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEXDownloadViewController.m; sourceTree = ""; }; 1913DD4219502E5D00573977 /* OEXVideoSummary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXVideoSummary.h; sourceTree = ""; }; @@ -838,7 +836,6 @@ 19A1339119CAAC21003ADD24 /* OEXClosedCaptionTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXClosedCaptionTableViewCell.h; sourceTree = ""; }; 19A1339219CAAC21003ADD24 /* OEXClosedCaptionTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEXClosedCaptionTableViewCell.m; sourceTree = ""; }; 19A1339319CAAC21003ADD24 /* OEXClosedCaptionTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = OEXClosedCaptionTableViewCell.xib; path = CutomePlayer/OEXClosedCaptionTableViewCell.xib; sourceTree = ""; }; - 19A1339619CAE108003ADD24 /* EULA.htm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = EULA.htm; sourceTree = ""; }; 19BB62281A9B28F1007DBF47 /* OEXRegistrationFieldWrapperView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXRegistrationFieldWrapperView.h; sourceTree = ""; }; 19BB62291A9B28F1007DBF47 /* OEXRegistrationFieldWrapperView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEXRegistrationFieldWrapperView.m; sourceTree = ""; }; 19BB622D1A9C656B007DBF47 /* OEXMySettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXMySettingsViewController.h; sourceTree = ""; }; @@ -1257,7 +1254,7 @@ 778F177D1C0E049B0099BF93 /* CourseCatalogViewControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseCatalogViewControllerTests.swift; sourceTree = ""; }; 778F17811C0E06480099BF93 /* TestRouterEnvironment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRouterEnvironment.swift; sourceTree = ""; }; 778F17841C10A1B50099BF93 /* CourseCatalogDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseCatalogDetailViewController.swift; sourceTree = ""; }; - 7791C4EC1C651E9D0005745B /* OEXRegistrationViewControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OEXRegistrationViewControllerTests.swift; sourceTree = ""; }; + 7791C4EC1C651E9D0005745B /* RegistrationViewControllerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationViewControllerTests.swift; sourceTree = ""; }; 7793764C1BED27D000900A8C /* BasicAuthCredential.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicAuthCredential.swift; sourceTree = ""; }; 7793764E1BED404C00900A8C /* OEXConfig+URLCredentialProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OEXConfig+URLCredentialProvider.swift"; sourceTree = ""; }; 779376541BF15A8F00900A8C /* OEXConfig+URLCredentialProviderTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "OEXConfig+URLCredentialProviderTests.swift"; sourceTree = ""; }; @@ -1457,7 +1454,7 @@ B41F22BA1A113D3D0022E01F /* OEXDownloadManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEXDownloadManager.m; sourceTree = ""; }; B42DA1881A1539F000E3AD4E /* OEXFileUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OEXFileUtility.m; sourceTree = ""; }; B42DA18A1A153A0500E3AD4E /* OEXFileUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OEXFileUtility.h; sourceTree = ""; }; - B47780581AADA95400436DB4 /* Terms-and-Services.htm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "Terms-and-Services.htm"; sourceTree = ""; }; + B47780581AADA95400436DB4 /* TermsOfServices.htm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = TermsOfServices.htm; sourceTree = ""; }; B4A24D0C19EE8A6600CE5010 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; B4A9EA211966A2FA00AAB3DB /* NSObject+OEXReplaceNull.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+OEXReplaceNull.h"; sourceTree = ""; }; B4A9EA221966A2FA00AAB3DB /* NSObject+OEXReplaceNull.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+OEXReplaceNull.m"; sourceTree = ""; }; @@ -1524,6 +1521,9 @@ B78823A71FC6F69900F9CD61 /* RegistrationFieldController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationFieldController.swift; sourceTree = ""; }; B78823AB1FC709BD00F9CD61 /* String+Validation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Validation.swift"; sourceTree = ""; }; B78823AF1FC80CBB00F9CD61 /* RegistrationFieldControllerFactory.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RegistrationFieldControllerFactory.swift; sourceTree = ""; }; + B78B233A20908A5000F8D976 /* PrivacyPolicy.htm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = PrivacyPolicy.htm; sourceTree = ""; }; + B78B233B20908A5000F8D976 /* MobileAppEula.htm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = MobileAppEula.htm; sourceTree = ""; }; + B78B233E20908C3D00F8D976 /* AgreementTextView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreementTextView.swift; sourceTree = ""; }; BD3838531DD1CA7E00805697 /* OEXFontsTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OEXFontsTests.swift; sourceTree = ""; }; BD7C6C3D1DCA32360004D135 /* OEXFonts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OEXFonts.swift; sourceTree = ""; }; BD7C6C3F1DCA329A0004D135 /* fonts.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = fonts.json; sourceTree = ""; }; @@ -2552,6 +2552,7 @@ 694D349F1D75BDF80047F3F4 /* UIAlertController+OEXBlockActions.swift */, 77AF07761CB42AC400A42704 /* TabContainerView.swift */, E03E6A161D38EB9000944AAA /* SnackbarViews.swift */, + B78B233E20908C3D00F8D976 /* AgreementTextView.swift */, ); name = "Helper Views"; sourceTree = ""; @@ -2943,7 +2944,6 @@ B78823A21FC6F59A00F9CD61 /* Registration Field Views */, B4B6D5F11A949EDE000F44E8 /* Registration Field Controllers */, 7769071F1AD5EED600F5E7EB /* Screens */, - BECB7B661924EE06009C77F1 /* Login */, 77ADF4B01AC1F82300AC8955 /* Providers */, B4B6D5F01A949ED6000F44E8 /* Views */, B4B6D5EF1A949ECD000F44E8 /* Model */, @@ -3199,9 +3199,11 @@ BECB7B151924C0C3009C77F1 /* Supporting Files */ = { isa = PBXGroup; children = ( + B78B233B20908A5000F8D976 /* MobileAppEula.htm */, + B78B233A20908A5000F8D976 /* PrivacyPolicy.htm */, 773A04691AF289650076532C /* edX-Bridging-Header.h */, BEEEBF82196AAACF00EF2C35 /* Localizable.strings */, - B47780581AADA95400436DB4 /* Terms-and-Services.htm */, + B47780581AADA95400436DB4 /* TermsOfServices.htm */, BECB7B161924C0C3009C77F1 /* edX-Info.plist */, BECB7B1A1924C0C3009C77F1 /* main.m */, BECB7B1C1924C0C3009C77F1 /* edX-Prefix.pch */, @@ -3223,7 +3225,7 @@ 77ADB7921C92228D006A66A1 /* XCTestCase+Stream.swift */, 7745B4001C88DD0900E76ACD /* ServerChangedCheckerTests.swift */, 7765025A1C73B90C007384E7 /* EmailTemplateTests.swift */, - 7791C4EC1C651E9D0005745B /* OEXRegistrationViewControllerTests.swift */, + 7791C4EC1C651E9D0005745B /* RegistrationViewControllerTests.swift */, 779998221C3C1EE00058E5FE /* EnrolledCoursesViewControllerTests.swift */, 7742F8D91C3C9785009E555A /* EnrollmentConfigTests.swift */, 778B40DC1C2F85BC0009F33E /* FeedTests.swift */, @@ -3416,7 +3418,6 @@ 22F8A9131F4708A50025E18A /* Main.storyboard */, 77DCD2381C2B13AA00CAEBB5 /* EnrolledCoursesFooterView.swift */, 77D6A9A51C28F98A00E67CCF /* EnrolledCoursesViewController.swift */, - 1905BFF01A31B037001917FA /* COURSE_NOT_LISTED.htm */, 1A3671F41BB03C7A00704032 /* OEXRearTableViewController.swift */, 223972E01FE92BB500B2BBEC /* EnrolledTabBarViewController.swift */, 2240FD551FF266E4001D6589 /* TabBarItem.swift */, @@ -3424,15 +3425,6 @@ name = "Front Rear views"; sourceTree = ""; }; - BECB7B661924EE06009C77F1 /* Login */ = { - isa = PBXGroup; - children = ( - 19A1339619CAE108003ADD24 /* EULA.htm */, - 1905BFF21A31B097001917FA /* NEW_USER.htm */, - ); - name = Login; - sourceTree = ""; - }; E03E6A131D38C90900944AAA /* Offline */ = { isa = PBXGroup; children = ( @@ -3716,7 +3708,6 @@ 69ECC6131D50D1170030CF87 /* loginScreenImage.png in Resources */, E0E27FC21EC469A800D1AEFE /* WhatsNew.json in Resources */, 69ECC6011D50D1170030CF87 /* OpenSans-ExtraBoldItalic.ttf in Resources */, - 19A1339719CAE108003ADD24 /* EULA.htm in Resources */, 69ECC6371D50D1170030CF87 /* ic_partiallywatched@3x.png in Resources */, 69ECC5FF1D50D1170030CF87 /* OpenSans-BoldItalic.ttf in Resources */, 69ECC6461D50D1170030CF87 /* separator1.png in Resources */, @@ -3753,10 +3744,11 @@ 77DC29601ABCA0F200FAD22C /* OEXLoginSplashViewController.xib in Resources */, 69ECC6181D50D1170030CF87 /* bt_google_RTL.png in Resources */, 6926CDB01D59BE3600A16E22 /* ic_seek_thumb.png in Resources */, - B47780591AADA95400436DB4 /* Terms-and-Services.htm in Resources */, + B47780591AADA95400436DB4 /* TermsOfServices.htm in Resources */, 22F8A9141F4708A50025E18A /* Main.storyboard in Resources */, 69ECC64A1D50D1170030CF87 /* launchBackground.png in Resources */, 69ECC6201D50D1170030CF87 /* bt_signin_deactive.png in Resources */, + B78B233D20908A5100F8D976 /* MobileAppEula.htm in Resources */, 69ECC62F1D50D1170030CF87 /* ic_cancel@3x.png in Resources */, 198826E91952FE39005D4D8A /* OEXOpenInBrowserViewController.xib in Resources */, 69ECC63C1D50D1170030CF87 /* icon_facebook_white.png in Resources */, @@ -3769,6 +3761,7 @@ 1A55019C1BBA30C900D5F9DD /* profiles.json in Resources */, 22D73B5D1ED575C000220280 /* course-dates.js in Resources */, BD7C6C401DCA329A0004D135 /* fonts.json in Resources */, + B78B233C20908A5100F8D976 /* PrivacyPolicy.htm in Resources */, 69ECC6021D50D1170030CF87 /* OpenSans-Italic.ttf in Resources */, 69ECC6481D50D1170030CF87 /* separator5.png in Resources */, 69ECC6141D50D1170030CF87 /* bt_blue2.png in Resources */, @@ -3776,7 +3769,6 @@ 69ECC6091D50D1170030CF87 /* Icon-29@2x.png in Resources */, 69ECC6391D50D1170030CF87 /* ic_unwatched@3x.png in Resources */, 69ECC61B1D50D1170030CF87 /* bt_logout_active.png in Resources */, - 1905BFF11A31B037001917FA /* COURSE_NOT_LISTED.htm in Resources */, 69ECC6291D50D1170030CF87 /* check@2x.png in Resources */, 22A4191E1EB1CF1500BBC8CA /* shareCourse@2x.png in Resources */, E021F46C1F739599007A26E7 /* loginScreenImage@2x~ipad.png in Resources */, @@ -3819,7 +3811,6 @@ 805329101B0E80E50093B177 /* DiscussionResponses.storyboard in Resources */, 22A4191D1EB1CF1500BBC8CA /* shareCourse.png in Resources */, 6960892D1D53935500EE66DD /* courseCertificate@3x.png in Resources */, - 1905BFF31A31B097001917FA /* NEW_USER.htm in Resources */, 6926CDB11D59BE3600A16E22 /* ic_seek_thumb@2x.png in Resources */, 69ECC6351D50D1170030CF87 /* ic_next_default.png in Resources */, 69ECC6311D50D1170030CF87 /* ic_download.png in Resources */, @@ -4297,6 +4288,7 @@ 77C182AA1CD2E46900AE1474 /* TablePaginationManipulator.swift in Sources */, 0B1212221B4F089A002EE96C /* OEXCoursewareAccess.m in Sources */, 77DCD2391C2B13AA00CAEBB5 /* EnrolledCoursesFooterView.swift in Sources */, + B78B233F20908C3D00F8D976 /* AgreementTextView.swift in Sources */, E0D159951EB87699005E2A76 /* WhatsNewDataModel.swift in Sources */, 77ADF4A91AC1B57800AC8955 /* UIImage+OEXColors.m in Sources */, 69F998571E6FEB2400CDFA9C /* OEXAnalytics+AppReview.swift in Sources */, @@ -4539,7 +4531,7 @@ 2264ED861FB9A40F00DE49BE /* AdditionalTabBarViewControllerTests.swift in Sources */, 227812BB1EF29773000D25EF /* OEXVideoSummaryTestDataFactory.swift in Sources */, 1A6E86261BB9CEC90039A216 /* UserProfileViewTests.swift in Sources */, - 7791C4ED1C651E9D0005745B /* OEXRegistrationViewControllerTests.swift in Sources */, + 7791C4ED1C651E9D0005745B /* RegistrationViewControllerTests.swift in Sources */, E03402241C7F2308003EB9B7 /* DiscussionTestsDataFactory.swift in Sources */, 7706AAC31BCFF28B00728432 /* NSAttributedString+FormattingTests.swift in Sources */, 77FEF2241C8A0A45009DFDB3 /* OEXFileUtility+TestAdditions.m in Sources */, @@ -4743,6 +4735,7 @@ CODE_SIGN_ENTITLEMENTS = edX.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; CONFIGURATION_BUILD_DIR = "$PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; DEVELOPMENT_TEAM = 57UCUYGPA2; ENABLE_BITCODE = NO; @@ -5183,6 +5176,7 @@ CODE_SIGN_ENTITLEMENTS = edX.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; CONFIGURATION_BUILD_DIR = "$PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; DEVELOPMENT_TEAM = 57UCUYGPA2; ENABLE_BITCODE = NO; @@ -5221,6 +5215,7 @@ CODE_SIGN_ENTITLEMENTS = edX.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; CONFIGURATION_BUILD_DIR = "$PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; DEVELOPMENT_TEAM = 57UCUYGPA2; ENABLE_BITCODE = NO;