1. 28 Jun, 2014 1 commit
  2. 27 Jun, 2014 3 commits
  3. 26 Jun, 2014 3 commits
  4. 25 Jun, 2014 2 commits
  5. 24 Jun, 2014 1 commit
  6. 23 Jun, 2014 1 commit
  7. 20 Jun, 2014 5 commits
  8. 19 Jun, 2014 1 commit
  9. 18 Jun, 2014 4 commits
  10. 17 Jun, 2014 5 commits
  11. 16 Jun, 2014 4 commits
  12. 13 Jun, 2014 3 commits
  13. 12 Jun, 2014 3 commits
  14. 11 Jun, 2014 4 commits
    • Fix wiki search query · 4959f3b8
      and formatting error in a doc file.
      Don Mitchell committed
    • Annotations Tools: i18n Make stati strings extractable · e48cc16d
      Original changes found in this commit
      https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca
      3512bb085eb
      
      Conflicts:
      	common/lib/xmodule/xmodule/textannotation_module.py
      	common/lib/xmodule/xmodule/videoannotation_module.py
      lduarte1991 committed
    • Annotation Tool: PR #4019 · 848c7165
      Reverting commit @3bfb633f and updating openseadragon.js for latest build
      
      Conflicts:
      	common/lib/xmodule/xmodule/imageannotation_module.py
      	common/lib/xmodule/xmodule/textannotation_module.py
      	common/lib/xmodule/xmodule/videoannotation_module.py
      lduarte1991 committed
    • Annotation Tool: PR #3969 · fecb2e16
      Text Annotation Tool: Added Instructor Filter and Clear Search
      
      Video Annotation Tool: Added Instructor Filter
      
      Image Annotation Tool: Added Instructor Filter
      
      Image Annotation Tool: Annotation Mode for AB Testing
      
      Annotation Tools PR Fixes
      
      - forgot to overwrite the previous line
      
      Annotation Tools: PR Fixes
      
      - Fixed camel case for variable name
      - Fixed indentation in imageannotation.html
      - Changed all mentions of Instructor Username to Email
      - Turned annotation_mode into phrase
      - Fixed indentation in imageannotation.html
      - Added comments in imageannotation.html
      
      - Changing annotation_mode in OSDA
      
      Annotator Tools: OpaqueKeys update for Notes
      
      Annotation Tools: Added CommonAnnotatorMixin
      
      Annotator Tool: Fixed delete bug and factored out settings
      
      Removed print context
      
      Conflicts:
      	common/lib/xmodule/xmodule/imageannotation_module.py
      	common/lib/xmodule/xmodule/textannotation_module.py
      	common/lib/xmodule/xmodule/videoannotation_module.py
      	lms/djangoapps/notes/views.py
      lduarte1991 committed