Files
edx-platform/common/static/js/vendor
lduarte1991 fecb2e1682 Annotation Tool: PR #3969
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
2014-06-11 10:19:06 -04:00
..
2013-02-06 11:13:50 -05:00
2014-06-11 10:19:06 -04:00
2014-04-14 14:28:06 -04:00
2013-12-17 13:22:08 +02:00
2013-08-02 09:52:12 -04:00
2013-08-02 09:52:12 -04:00
2012-10-12 20:55:16 -04:00
2013-10-04 13:43:50 -04:00
2013-05-22 15:55:52 -04:00
2013-08-02 09:52:12 -04:00
2013-08-02 09:52:12 -04:00
2013-08-02 09:52:12 -04:00
2013-08-02 09:52:12 -04:00
2013-08-02 09:52:12 -04:00
2013-08-02 09:52:12 -04:00
2013-10-04 13:43:50 -04:00