1. 06 Feb, 2014 1 commit
  2. 27 Jan, 2014 1 commit
    • annotation tools · 7e2652b5
      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.
      daniel cebrian committed
  3. 22 Jan, 2014 1 commit
  4. 15 Jan, 2014 1 commit
  5. 06 Jan, 2014 1 commit
    • Add pagination to Studio's Files and Uploads page · f9c45586
      These changes implement STUD-813. The commit consists of the
      following logical changes:
       - a REST API has been implemented for a course's assets
       - the page itself now fetches the assets client-side
       - the Backbone.Paginator library is used to support pagination
       - the AssetCollection has been refactored to extend
         Backbone.Paginator.requestPager so that it can be paged
       - an abstract PagingView class has been added to generalize
         the communication with a paging REST API
       - the AssetsView has been reimplemented to extend PagingView
       - two new child views have been added:
         - PagingHeader: the paging controls above the list of assets
         - PagingFooter: the paging controls below the assets
      Andy Armstrong committed
  6. 31 Dec, 2013 2 commits
  7. 18 Dec, 2013 1 commit
  8. 17 Dec, 2013 1 commit
  9. 04 Dec, 2013 1 commit
  10. 20 Nov, 2013 1 commit
  11. 25 Oct, 2013 1 commit
  12. 23 Oct, 2013 1 commit
  13. 22 Oct, 2013 1 commit
  14. 07 Oct, 2013 2 commits
    • Cleanup to drag and drop implementation. · 61cfb912
      Also includes RequireJS changes.
      
      Fixes bugs:
      STUD-755, STUD-152, STUD-700, STUD-699
      cahrens committed
    • Rework course overview drag and drop. · 2d3cba06
      Failed drags bring the element back to where it started; elements are
      locked to the y-axis, states are represented as CSS classes for
      styling, elements can be dragged across section/subsection borders,
      and dragging to the top/bottom of a section Just Works:tm:.
      
      Needs some styling love to give visual representation of where the
      dragged element will drop, though.
      
      TODO: It'd be good to have auto expand/collapse for subsections.
      Peter Fogg committed
  15. 04 Oct, 2013 1 commit
  16. 23 Sep, 2013 1 commit
  17. 26 Aug, 2013 1 commit
  18. 02 Aug, 2013 1 commit
  19. 01 Aug, 2013 1 commit
    • video_speed_control passes all tests except 1 · 8c3f4388
      Mocked loading of captions.
      Fixed remaining tests in captions.
      Fixed failing tests in speed control, and quality control. Turned off all VideoAlpha tests because browser crashes when all are run at once. To check that they are passing, go through each file one by one, replacing xdescribe with describe. Dont forget to change back to xdescribe when the test was run and turns out to be OK.
      Some tests at the end of video_player_spec.js pass
      Further fixing tests in video_player_spec file.
      transfers changes to test_logic from master to __init__ and other files
      Fixing more tests.
      jmclaus committed
  20. 09 Jul, 2013 3 commits
  21. 18 Jun, 2013 2 commits
  22. 30 May, 2013 1 commit
  23. 22 May, 2013 3 commits
  24. 20 May, 2013 5 commits
  25. 16 May, 2013 3 commits
  26. 15 May, 2013 2 commits