Skip to content
Snippets Groups Projects
  1. Apr 24, 2014
  2. Apr 22, 2014
  3. Apr 14, 2014
    • Nick Parlante's avatar
      Multiple-choice features · ab7d3b52
      Nick Parlante authored
      Features by Jeff Ericson and Nick Parlante squashed
      down to one commit.
      
      -shuffle of choices within a choicegroup (Nick)
      -answer-pool subsetting within a choicegroup (Jeff)
      -masking of choice names within a choicegroup, (Nick)
       used by shuffle and answer-pool
      -targeted-feedback within a multiplechoiceresponse (Jeff)
      -delay-between-submissions capa feature (Jeff)
      ab7d3b52
    • jmclaus's avatar
      HD control is hidden initially. On first play of video, when · f05c0aa8
      jmclaus authored
      player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
      f05c0aa8
  4. Apr 09, 2014
  5. Apr 08, 2014
  6. Apr 02, 2014
    • Nimisha Asthagiri's avatar
      Tiny MCE version 4.0.20 · f44a1b6c
      Nimisha Asthagiri authored
      Changed tiny-MCE to not load CSS files dynamically.
      Added CSS files for tiny-MCE in env files.
      Moved TinyMCE files to directory structure required by Jake command.
      Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
      Updated CHANGELOG to indicate tinymce version 4.0.20.
      Renamed tinymce.css.
      Directions for creating tinymce.full.min.js and commenting of edX changes.
      Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
      Allow TinyMCE to handle CSS within the iframe.
      f44a1b6c
    • Abdallah's avatar
      Upgrade to TinyMCE 4.0.16. · fe847720
      Abdallah authored
      Detailed commit messages:
      deleted old tinymce
      
      new tinymce
      js changes to support new tinymce
      scss changes for alignments
      
      Include all the controls on the toolbar that we previously had.
      
      Changes to support Bulk e-mail usage.
      
      adding new studio skin for TinyMCE4
      
      Get handling of static image links working again.
      
      Delete old Studio skin.
      
      Version 1.3 of CodeMirror plugin.
      
      Modify paths for location of CodeMirror files.
      
      Fire events when CodeMirror Editor is open and closed.
      
      Needed to switch static links back and forth.
      
      Remove CodeMirror tabbed editor.
      
      fixed tinymce visual editor css
      
      Change how we detect that an image has been inserted.
      
      made the codemirror look more studio-like
      
      reordered the tinymce buttons
      
      Update unit tests.
      
      Update acceptance test for image plugin.
      
      Make sure to strip out temporary caret.
      
      It can get left behind in style blocks.
      
      Test for style block being maintained.
      
      Allow TinyMCE to create p's, else formatting doesn't work.
      
      Add tests for toolbar buttons and converting links.
      
      Add test for code format toolbar button.
      
      Remove unnecessary code.
      
      Remove unused testing templates and unused tabs.
      
      Update tinymce paths.
      
      Fire an event with the link plugin closes so we can rewrite links.
      
      pep8
      
      Updates from code review.
      
      Change the name of the button to "Edit HTML".
      
      Changed menu name for consistency, but we don't show it.
      
      Changed name of "code" toolbar button to "Code block".
      
      Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422
      
      Fire events before and after the image dialog is shown.
      
      We use this to rewrite links.
      
      Change the event handling for image plugin.
      
      Fixes FireFox bug, and allows us to correct the image path when we show the plugin (as opposed ot only correcting path when we close the plugin).
      
      Code review feedback.
      
      Fire events before and after the link dialog is shown.
      
      This allows us to convert the static links.
      
      Remove unnecessary helper method.
      
      keeping the component editor inside the component window
      
      Use compressed CodeMirror file.
      
      replaced code icon in TinyMCE editor; simplified UI on TMCE toolbar
      
      Change code editor icon to say HTML.
      
      Move code style block button.
      
      Update tests for minor UI changes.
      
      Code editor button no longer shows an icon, and code style toolbar button location has moved.
      
      Fix typos.
      fe847720
    • Alexander Kryklia's avatar
  7. Mar 31, 2014
    • Alexander Kryklia's avatar
    • Alexander Kryklia's avatar
    • Alexander Kryklia's avatar
      Add multiple transcripts editor. · dfa7c27e
      Alexander Kryklia authored
      Fix donwload subs for non youtube videos and non-en language - continue.
      Add acceptance tests.
      Add detetion of assets on request.
      Updated docstring.
      Add fixes and acceptance tests.
      Fix acceptance tests.
      Update docsrtings and cleanup code, resful for language_id.
      Specify exception type in POST.
      Fix url in upload module.
      Improve exception handling.
      Remove 'en' and catching in editable_metadata.
      Move descriptor.get_context test to lms tests.
      Add query parameter to translation dispatch.
      Response to format parameter of translatin GET request.
      Fix Acceprance test: Metadata Editor.
      move handlers to proper scores.
      Split video player into smaller files.
      Add ugettext and fix typoes.
      Add changelog.
      Support for downloading non-ascii filenames.
      Change event binding.
      Add content-language to download requests.
      Reractor POST handler to not update self.transcripts.
      dfa7c27e
  8. Mar 28, 2014
  9. Mar 26, 2014
  10. Mar 21, 2014
    • cahrens's avatar
      Upgrade version of TinyMCE to 4.0.16. · d89ebedc
      cahrens authored
      Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422
      d89ebedc
    • Nimisha Asthagiri's avatar
      Changes for viewing built-in tabs in studio · e86b4a12
      Nimisha Asthagiri authored
      Changed "Status Page" -> "Page".
      
      UX:
          support for displaying built-in tabs
          restored drag and drop on Studio Pages
          additional styling for fixed state on Studio Pages
          add a new page action added to bottom of Studio Pages
      
      Dev
          changes for viewing tabs in studio,
          refactored the tab code,
          decoupled the code from django layer.
          is_hideable flag on tabs
          get_discussion method is needed to continue to support
      external_discussion links for now since used by 6.00x course.
          override the __eq__ operator to support comparing with
      dict-type tabs.
      
      Test
          moved test code to common,
          added acceptance test for built-in pages
          added additional unit tests for tabs.
          changed test_split_modulestore test to support serializing objects
      that are fields in a Course.
      
      Env:
          updated environment configuration settings so they are
          consistent for both cms and lms.
      e86b4a12
  11. Mar 20, 2014
  12. Mar 19, 2014
    • Valera Rozuvan's avatar
      Move loading of YouTube API to video module. · 2e8fe6a4
      Valera Rozuvan authored
      The availability of the YouTube API will be stored in student's settings.
      The YouTube API is loaded asynchronously now, so no need to pass a
      parameter to the front-end telling it if YouTube API should not be loaded
      because of it's unavailability.
      
      Removing loading of YouTube API from Studio RequireJS config. Now loading
      of YouTube API is handled by Video module.
      
      BLD-531.
      2e8fe6a4
  13. Mar 14, 2014
    • Alexander Kryklia's avatar
      Fix donwload subs for non youtube videos and non-en language. · dd20e84c
      Alexander Kryklia authored
      Check for status in test.
      Add test for track url.
      Fix test to use cookie.
      Use download_track in feature file.
      Add new tests for get_transcript.
      Add html5 test.
      Add content check.
      Add tests for available_translations dispatch.
      Disable flaky cms test.
      Add  w/o english transcript tests.
      Add to changelog.
      dd20e84c
  14. Mar 11, 2014
  15. Mar 07, 2014
  16. Mar 06, 2014
  17. Feb 28, 2014
  18. Feb 27, 2014
    • Andy Armstrong's avatar
      Add new container page that can display nested xblocks · fcc0231d
      Andy Armstrong authored
      This is the changes for STUD-1244, which introduces the ability for Studio to display
      arbitrarily nested xblocks. In this change, a new container page is introduced which can
      display nested xblocks. In particular, the xblock type of 'vertical' is special cased
      to be shown inline as a collapsible section. The unit page is mostly unchanged, except
      that container xblock's are shown as a link to their container page, rather than being
      shown inline.
      fcc0231d
  19. Feb 24, 2014
  20. Feb 13, 2014
    • Carson Gee's avatar
      Push To LMS updates · f02c074d
      Carson Gee authored
      Added tests
      Converted scripts to django commands
      Removed advanced module requirement
      Generalized to platform
      Switched to subprocess for shell commands
      Beefed up resiliency and error checking.
      Refactored since #1910 removed get_location_and_verify_access
      Added settings to aws for export directory and reworked test setup and teardown
      Several review based fixes
      Added line to Changelog
      Changed URL handler to be accepting and moved git bare repo inside of test_root/data
      Added exception logging to help trace issues
      Added output in exception logging
      Made the branch to commit to explicit instead of implicit
      Skipping git identity test on condition of global configuration set
      f02c074d
  21. Feb 12, 2014
  22. Feb 11, 2014
  23. Feb 06, 2014
Loading