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

..

calc

Upgrade pyparsing to 2.0.1

2014-04-02 16:09:53 -04:00

capa

Merge remote-tracking branch 'edx/master' into ok-merge-from-master

2014-05-23 10:05:56 -04:00

chem

Upgrade pyparsing to 2.0.1

2014-04-02 16:09:53 -04:00

opaque_keys

OpaqueKey copy and deepcopy are identity ops

2014-06-09 15:10:47 -04:00

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

2013-05-31 12:01:33 -04:00

symmath

pep8/pylint cleanup on symmath/formula.py

2014-02-11 09:46:24 -05:00

xmodule

Annotation Tool: PR #3969

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

django_startup.py

Very Minor tweaks to the LMS and CMS startup.

2014-01-02 14:27:52 -05:00

extract_tar.py

Fix pylint disable pragmas that were pep8 violations

2014-03-20 10:18:40 -04:00

html_to_text.py

Hide "Email Settings" from student dash if bulk email not enabled

2013-08-29 12:40:33 -04:00

logsettings.py

Remove lms/lib from sys.path in favore of using it as the module lms.lib

2013-11-08 11:08:48 -05:00

mail_utils.py

Wraps long lines in bulk email messages.

2014-04-25 18:25:20 +05:00

rooted_paths.py

Sort the css and js assets by numerical index

2013-04-29 07:31:48 -04:00

sample-post.py

Update requests library to 1.2.3

2013-09-10 09:59:21 -04:00

supertrace.py

…

tempdir.py

Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.

2013-02-21 11:38:45 -05:00