1. 11 Mar, 2015 1 commit
  2. 28 Jan, 2015 2 commits
  3. 27 Jan, 2015 1 commit
  4. 21 Jan, 2015 1 commit
  5. 20 Jan, 2015 1 commit
  6. 15 Jan, 2015 1 commit
  7. 14 Jan, 2015 1 commit
  8. 12 Jan, 2015 1 commit
  9. 19 Dec, 2014 1 commit
  10. 30 Oct, 2014 1 commit
  11. 20 Oct, 2014 1 commit
  12. 17 Oct, 2014 2 commits
  13. 03 Oct, 2014 1 commit
  14. 01 Oct, 2014 1 commit
  15. 28 Aug, 2014 1 commit
  16. 21 Aug, 2014 1 commit
    • Course Reruns UI · 9f8f64cf
      Studio: adding course re-run-centric static template rendering
      
      * initial HTML for dashboard states
      * initial HTML for new course re-run view/form
      * initial HTML placeholder for outline alert UI
      
      Conflicts:
      	cms/templates/index.html
      
      Studio: adding styling for course re-run-centric views
      
      * adding new view/page mast-wizard type
      * refactoring create course/element form styling
      * adding course re-run view specific styling
      * adding courses processing styling (w/ alerts and status)
      
      Course rerun server-side updates: support display_name and DuplicateCourseError.
      
      Studio: further design revisions and tweaks from feedback
      
      * removing new window attribute from re-run control
      * removing links from processing courses
      * revising look/feel of dismiss action on dashboard + alert
      * correcting font-weight of dashboard processing title
      * adding extra space to course rerun action on dashboard
      * re-wording secondary cancel action on rerun view
      
      Conflicts:
      	cms/templates/index.html
      
      Added interation on unsucceeded courses in dashboard
      
      Studio: removing 'rel=external' property from course re-run actions
      
      Studio: removing hover styles for processing courses
      
      Fixed value bug in split and set course listing to display run
      
      moved task.py for rerun
      Mathew Peterson committed
  17. 14 Aug, 2014 5 commits
  18. 13 Aug, 2014 1 commit
  19. 08 Aug, 2014 1 commit
  20. 02 Aug, 2014 1 commit
  21. 01 Aug, 2014 1 commit
  22. 15 Jul, 2014 1 commit
  23. 30 May, 2014 1 commit
  24. 29 May, 2014 1 commit
  25. 17 May, 2014 2 commits
  26. 02 Apr, 2014 2 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
  27. 27 Mar, 2014 1 commit
  28. 26 Mar, 2014 1 commit
  29. 21 Mar, 2014 1 commit
  30. 28 Jan, 2014 1 commit
  31. 06 Jan, 2014 2 commits
    • 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