1. 01 Oct, 2014 1 commit
  2. 29 Sep, 2014 1 commit
  3. 22 May, 2014 1 commit
  4. 24 Apr, 2014 3 commits
  5. 23 Apr, 2014 2 commits
  6. 22 Apr, 2014 1 commit
  7. 02 Apr, 2014 1 commit
    • 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
  8. 26 Mar, 2014 1 commit
  9. 21 Mar, 2014 10 commits
  10. 05 Mar, 2014 1 commit
  11. 19 Dec, 2013 1 commit
  12. 24 Sep, 2013 2 commits
    • Namespace the acceptance tests so they show up nicely in jenkins · 7669b4d7
      Conflicts:
      	cms/djangoapps/contentstore/features/advanced-settings.feature
      	cms/djangoapps/contentstore/features/checklists.feature
      	cms/djangoapps/contentstore/features/component.feature
      	cms/djangoapps/contentstore/features/course-overview.feature
      	cms/djangoapps/contentstore/features/course-settings.feature
      	cms/djangoapps/contentstore/features/course-team.feature
      	cms/djangoapps/contentstore/features/course-updates.feature
      	cms/djangoapps/contentstore/features/courses.feature
      	cms/djangoapps/contentstore/features/discussion-editor.feature
      	cms/djangoapps/contentstore/features/grading.feature
      	cms/djangoapps/contentstore/features/html-editor.feature
      	cms/djangoapps/contentstore/features/problem-editor.feature
      	cms/djangoapps/contentstore/features/section.feature
      	cms/djangoapps/contentstore/features/signup.feature
      	cms/djangoapps/contentstore/features/static-pages.feature
      	cms/djangoapps/contentstore/features/subsection.feature
      	cms/djangoapps/contentstore/features/textbooks.feature
      	cms/djangoapps/contentstore/features/upload.feature
      	cms/djangoapps/contentstore/features/video-editor.feature
      	cms/djangoapps/contentstore/features/video.feature
      	lms/djangoapps/courseware/features/certificates.feature
      	lms/djangoapps/courseware/features/help.feature
      	lms/djangoapps/courseware/features/high-level-tabs.feature
      	lms/djangoapps/courseware/features/homepage.feature
      	lms/djangoapps/courseware/features/login.feature
      	lms/djangoapps/courseware/features/lti.feature
      	lms/djangoapps/courseware/features/navigation.feature
      	lms/djangoapps/courseware/features/problems.feature
      	lms/djangoapps/courseware/features/registration.feature
      	lms/djangoapps/courseware/features/signup.feature
      	lms/djangoapps/courseware/features/video.feature
      	lms/djangoapps/courseware/features/word_cloud.feature
      Jay Zoldak committed
  13. 22 Aug, 2013 1 commit
    • Stylistic changes · d9659531
      CMS tests should now run on IE
      
      CMS tests will now run on Safari
      
      Rebased wrong
      
      Forgot to update the test_acceptance.sh
      
      Changed way of string splitting
      JonahStanley committed
  14. 01 Aug, 2013 1 commit
  15. 23 May, 2013 1 commit