Skip to content
Snippets Groups Projects
  1. Jan 29, 2014
    • Chris Dodge's avatar
      Add optional feature to lock out accounts after N failed login attempts.... · 8c60f293
      Chris Dodge authored
      Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds.
      
      add DB migration and fix earlier mistakes in student migration history
      
      add tests and fix bugs that came out of those unit tests
      
      remove unused import
      
      pep8/pylint
      
      address some PR feedback
      
      fix tests
      
      fix broken test
      
      try to mock time
      
      use freeze-gun to overload the system time to simulate the future
      8c60f293
    • Xavier Antoviaque's avatar
      Selectively require/hide registration fields & add country/city fields · 386115ae
      Xavier Antoviaque authored
      Extend the capabilities of the REGISTRATION_OPTIONAL_FIELDS
      configuration variable, to allow to select, for each individual field,
      if it should be 'hidden', 'optional' or 'required'.
      
      Rename the configuration variable to REGISTRATION_EXTRA_FIELDS to reflect
      the additional capabilities, and updates the defaults.
      
      As extra fields, configurable through the REGISTRATION_EXTRA_FIELDS
      variable. Hidden by default.
      
      Tickets: MCKIN-168 MCKIN-184
      
      Note: Studio also has a registration page, which uses the same account
      creation page. It should be possible to use it without requiring the
      variable from the LMS, as the fields are different.
      386115ae
  2. Jan 27, 2014
    • daniel cebrian's avatar
      annotation tools · 7e2652b5
      daniel cebrian authored
      First set of fixes from the pull request
      
      This does not include some of the testing files. The textannotation and
      videoannotation test files are not ready. waiting for an answer on the
      issue.
      
      Deleted token line in api.py and added test for token generator
      
      Added notes_spec.coffee
      
      remove spec file
      
      fixed minor error with the test
      
      fixes some quality errors
      
      fixed unit test
      
      fixed unit test
      
      added advanced module
      
      Added notes_spec.coffee
      
      remove spec file
      
      Quality and  Testing Coverage
      
      1. in test_textannotation.py I already check for line 75 as it states
      in the diff in line 43, same with test_videoanntotation
      2. Like you said, exceptions cannot be checked for
      firebase_token_generator.py. The version of python that is active on
      the edx server is 2.7 or higher, but the code is there for correctness.
      Error checking works the same way.
      3. I added a test for student/views/.py within tests and deleted the
      unused secret assignment.
      4. test_token_generator.py is now its own file
      
      Added Secret Token data input
      
      fixed token generator
      
      Annotation Tools in Place
      
      The purpose of this pull request is to install two major modules: (1) a
      module to annotate text and (2) a module to annotate video. In either
      case an instructor can declare them in advanced settings under
      advanced_modules and input content (HTML in text, mp4 or YouTube videos
      for video). Students will be able to highlight portions and add their
      comments as well as reply to each other. There needs to be a storage
      server set up per course as well as a secret token to talk with said
      storage.
      
      Changes:
      1. Added test to check for the creation of a token in tests.py (along
      with the rest of the tests for student/view.py)
      2. Removed items in cms pertaining to annotation as this will only be
      possible in the lms
      3. Added more comments to firebase_token_generator.py, the test files,
      students/views.py
      4. Added some internationalization stuff to textannotation.html and
      videoannotation.html. I need some help with doing it in javascript, but
      the html is covered.
      
      incorporated lib for traslate
      
      fixed quality errors
      
      fixed my notes with catch token
      
      Text and Video Annotation Modules - First Iteration
      
      The following code-change is the first iteration of the modules for
      text and video annotation.
      
      Installing Modules:
      1. Under “Advanced Settings”, add “textannotation” and
      “videoannotation” to the list of advanced_modules.
      2. Add link to an external storage for annotations under
      “annotation_storage_url”
      3. Add the secret token for talking with said storage under
      “annotation_token_secret”
      
      Using Modules
      1. When creating  new unit, you can find Text and Video annotation
      modules under “Advanced” component
      2. Make sure you have either Text or Video in one unit, but not both.
      3. Annotations are only allowed on Live/Public version and not Studio.
      
      Added missing templates and fixed more of the quality errors
      
      Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor
      
      Added a space after # in comments
      
      Fixed issue with an empty Module and token links
      
      Added licenses and fixed vis naming scheme and location.
      7e2652b5
  3. Jan 15, 2014
    • Will Daly's avatar
      Refactored bok-choy directory structure · 4afd5ea4
      Will Daly authored
      Added fixtures for course and xblock creation
      Added bok-choy Studio tests
      Added bok-choy tests for ora self- and ai- assessment
      Refactored auto-auth; added staff and course-enrollment options
      Removed extra javascript properties from page objects
      4afd5ea4
  4. Jan 14, 2014
    • Chris Dodge's avatar
      Introduction of the Microsite feature which allows for limited multi-tenant... · a3211a74
      Chris Dodge authored
      Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
      
      fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it
      
      pep8/pylint fixes
      
      address PR feedback, remove underscore from test hostname
      
      more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team
      
      manually add Ned's single-to-double quote fix
      
      change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path
      
      Conflicts:
      	lms/templates/help_modal.html
      a3211a74
  5. Dec 15, 2013
  6. Dec 12, 2013
  7. Dec 10, 2013
  8. Dec 04, 2013
  9. Dec 03, 2013
  10. Nov 26, 2013
  11. Nov 22, 2013
  12. Nov 20, 2013
  13. Nov 19, 2013
  14. Nov 18, 2013
  15. Nov 08, 2013
  16. Nov 04, 2013
  17. Nov 01, 2013
  18. Oct 31, 2013
    • Diana Huang's avatar
      Code cleanup due to review comments · 17610edf
      Diana Huang authored
      * make `user_status` more intelligent
      * remove some logic from the templates
      * rename `parse_error_msg` to `parsed_error_msg`
      * fix up and add more tests
      
      LMS-1387
      17610edf
  19. Oct 30, 2013
  20. Oct 29, 2013
  21. Oct 25, 2013
  22. Oct 16, 2013
  23. Oct 03, 2013
  24. Sep 27, 2013
    • Jason Bau's avatar
      Stanford paid course registration · 667a1ead
      Jason Bau authored
      With tests, some settings changes
      (all should default to not breaking anything for edx)
      
      Added styling for shopping cart User Experience
      - Styled shoppingcart list page
      - Styled navigation shopping cart button
      - Styled receipt page
      - Styled course about page for shopping cart courses
      
      Addressed HTML/SCSS issues
      
      Remove offending body class and unnecessary sass changes
      
      Addresses many review comments on stanford shopping cart
      
      * framework for generating order instructions on receipt page
        in shoppingcart.models
      * move user_cart_has_item into shoppingcart.models
      * move min_course_price_for_currency into course_modes.models
      * remove auto activation on purchase
      * 2-space indents in templates
      * etc
      
      revert indentation on navigation.html for ease of review
      
      pep8 pylint
      
      move logging/error handling from shoppingcart view to model
      
      Addressing @dave changes
      667a1ead
  25. Sep 25, 2013
  26. Sep 12, 2013
  27. Sep 11, 2013
  28. Sep 09, 2013
Loading