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

..

djangoapps

Annotation Tool: PR #3969

2014-06-11 10:19:06 -04:00

envs

Add Gujarati language

2014-05-27 07:43:03 -04:00

lib

Merge pull request #2905 from edx/opaque-keys

2014-05-23 12:58:20 -04:00

static

Merge pull request #3834 from cpennington/ok-merge-from-master

2014-05-23 11:36:52 -04:00

templates

Annotation Tool: PR #3969

2014-06-11 10:19:06 -04:00

__init__.py

…

.coveragerc

…

startup.py

Fix bad interaction between pluggable InputTypes and Microsites

2014-04-01 16:49:15 -04:00

tests.py

Test TemplateLookup dirs are not cleared during lms startup.

2014-04-03 20:23:44 +05:00

urls.py

Merge remote-tracking branch 'edx/master' into opaque-keys

2014-05-22 10:52:00 -04:00

wsgi_apache_lms.py

apache lms wsgi fix

2013-09-16 21:46:57 -07:00

wsgi.py

Remove extraneous configuration

2014-02-04 15:35:26 -05:00