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

..

applets/capa

Replace editamolecule input type applet with GWT version

2013-02-05 20:15:50 -05:00

coffee

crude fix for intermittent jasmine test failures

2014-04-29 14:26:12 -04:00

css

Image Annotation Tool: Add linkback functionality to image thumbnails

2014-05-23 14:59:31 -04:00

data/geoip

Embargo Middleware feature

2014-02-27 08:37:58 -05:00

fonts

adds/relocates shared vendor css (and assets) to static directories

2013-10-16 16:45:32 -04:00

images

Upgrade to TinyMCE 4.0.16.

2014-04-02 10:35:27 -04:00

js

Annotation Tool: PR #3969

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

sass

Studio: updating Sass ui-disabled placholder syntax and creating utility is-disabled class

2014-04-16 14:44:30 -04:00

scripts

fix tests on merge

2013-01-04 10:32:31 -05:00

.gitignore

Ignore compiled xmodule assets

2013-04-18 15:46:08 -04:00

js_test.yml

Add repsonse pagination to inline discussions

2014-04-02 14:32:58 -04:00