1. 02 Jun, 2014 1 commit
  2. 29 May, 2014 3 commits
  3. 28 May, 2014 1 commit
  4. 27 May, 2014 3 commits
  5. 23 May, 2014 2 commits
  6. 21 May, 2014 2 commits
  7. 20 May, 2014 1 commit
  8. 12 May, 2014 1 commit
  9. 02 May, 2014 1 commit
  10. 25 Apr, 2014 2 commits
  11. 24 Apr, 2014 2 commits
  12. 23 Apr, 2014 1 commit
  13. 22 Apr, 2014 1 commit
  14. 14 Apr, 2014 2 commits
    • Multiple-choice features · ab7d3b52
      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)
      Nick Parlante committed
    • HD control is hidden initially. On first play of video, when · f05c0aa8
      player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
      jmclaus committed
  15. 09 Apr, 2014 1 commit
  16. 08 Apr, 2014 2 commits
  17. 02 Apr, 2014 3 commits
    • Tiny MCE version 4.0.20 · f44a1b6c
      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.
      Nimisha Asthagiri committed
    • Upgrade to TinyMCE 4.0.16. · fe847720
      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.
      Abdallah committed
  18. 31 Mar, 2014 3 commits
  19. 28 Mar, 2014 1 commit
  20. 26 Mar, 2014 2 commits
  21. 21 Mar, 2014 2 commits
    • Upgrade version of TinyMCE to 4.0.16. · d89ebedc
      Switch from tabbed Visual/HTML Editor for HTML modules to showing the code editor as a plugin within TinyMCE (triggered from toolbar). STUD-1422
      cahrens committed
    • Changes for viewing built-in tabs in studio · e86b4a12
      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.
      Nimisha Asthagiri committed
  22. 20 Mar, 2014 3 commits