1. 16 Jun, 2015 1 commit
    • Fix modal css to be hidden immediately · 8d56fe3b
      Before the leanModal content css was applied after the js class
      was added to the body element. This causes leanModals to
      display for a split second before being hidden. This fix removes
      the need for the explicit css rule for static pages preview.
      Kevin Luo committed
  2. 09 Jun, 2015 1 commit
  3. 18 May, 2015 2 commits
    • Courseware license (Creative Commons): FED · a3887e95
      Use native checkboxes for courseware license options
      In Studio settings editor for video module, don't show license if feature-flagged off
      Don't let Scope.contents fields leak to Studio editor
      JS gettext() must all be on the same line for i18n
      Add docstrings for bok-choy tests
      Remove LicenseMixin from HTMLDescriptor
      Responding to UX review feedback
      Add aria-pressed attribute
      Use https links instead of protocol-relative links for links to creativecommons.org
      Remove license from course outline page in Studio
      David Baumgold committed
    • Added a simple XBlockMixin for courseware licenses · 2159d341
      This allows course authors to choose between two difference licenses for their
      course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
      that wish to allow custom licenses need only inherit from LicenseMixin, which
      adds a `license` field as a string.
      
      License information is displayed in the Studio editor view, and just below the
      rendered XBlock in the LMS. In addition, if the course block itself has a custom
      license set, this license will display just below the main body of the page
      on courseware pages.
      
      This entire feature is gated behind the LICENSING feature flag.
      David Baumgold committed
  4. 09 Mar, 2015 1 commit
  5. 03 Feb, 2015 1 commit
  6. 14 Jan, 2015 1 commit
  7. 06 Jan, 2015 1 commit
  8. 15 Oct, 2014 1 commit
  9. 01 Oct, 2014 1 commit
  10. 27 Aug, 2014 1 commit
  11. 06 Aug, 2014 1 commit
  12. 05 Aug, 2014 1 commit
  13. 31 Jul, 2014 2 commits
  14. 02 Jun, 2014 1 commit
  15. 23 May, 2014 2 commits
  16. 14 Apr, 2014 1 commit
  17. 08 Apr, 2014 1 commit
  18. 02 Apr, 2014 5 commits
    • Studio: syncing up font-based styling between TinyMCE editing view and Studio HTML xmodule preview · 473ed4cc
      Separating and documenting tinyMCE font imports from customized vendor code and customized render styling css files (because font must load first in iframe).
      
      Add the TinyMCE font file to the CMS pipeline.
      Brian Talbot committed
    • 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
  19. 26 Mar, 2014 1 commit
  20. 21 Mar, 2014 1 commit
  21. 20 Mar, 2014 1 commit
  22. 12 Mar, 2014 1 commit
  23. 11 Feb, 2014 1 commit
  24. 27 Jan, 2014 2 commits
    • Updating Annotator CSS · d214cb87
      The change in the css keeps fonts as they were and does not change them
      purely based on annotating a section.
      lduarte1991 committed
    • 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
  25. 27 Dec, 2013 1 commit
  26. 20 Dec, 2013 1 commit
  27. 16 Dec, 2013 1 commit
  28. 09 Dec, 2013 1 commit
  29. 27 Oct, 2013 2 commits
  30. 16 Oct, 2013 1 commit
  31. 20 Sep, 2013 1 commit