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

..

analytics

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

branding

Fixed register button on edge homepage.

2014-05-22 12:09:23 +05:00

bulk_email

StaffFactories accept course_keys, not courses. Make that clear in the interface.

2014-05-24 19:36:18 -04:00

certificates

Fix gen_cert_report to use CourseKeys.

2014-06-09 15:17:13 -04:00

circuit

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

class_dashboard

Fix dashboard data tests

2014-05-16 15:38:59 -04:00

course_wiki

StaffFactories accept course_keys, not courses. Make that clear in the interface.

2014-05-24 19:36:18 -04:00

courseware

Fix location.url [LMS-2786]

2014-06-09 15:17:20 -04:00

dashboard

Fix issues with psychometrics and git import

2014-05-16 11:47:14 -04:00

debug

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

django_comment_client

Opaque-keys: fix pylint violations

2014-05-24 19:36:09 -04:00

foldit

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

instructor

Fix variable name.

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

instructor_task

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

2014-05-09 15:29:32 -04:00

licenses

fixup! Serial number commands deserialize course keys

2014-05-22 09:06:13 -04:00

linkedin

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

2014-05-09 15:29:32 -04:00

lms_migration

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-08 12:09:23 -04:00

multicourse

MITX_ROOT_URL => EDX_ROOT_URL

2013-12-04 12:59:35 -05:00

notes

Annotation Tool: PR #3969

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

notification_prefs

Notifier re-subcribe via link

2014-01-22 09:54:27 -08:00

open_ended_grading

Fix logging bug in openended grading

2014-06-09 15:16:18 -04:00

psychometrics

Opaque-keys: fix pylint violations

2014-05-24 19:36:09 -04:00

shoppingcart

Fix performance regression

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

static_template_view

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

staticbook

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

2014-05-09 15:29:32 -04:00

verify_student

Fix performance regression

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