- 11 Jun, 2014 8 commits
-
-
Hotfix 2014-06-11
Sarina Canelake committed -
Allow users that have unregistered from a verified course to re-register.
Calen Pennington committed -
Fixes LMS-2830
Calen Pennington committed -
Harvard annotations on hotfix
Julia Hansbrough committed -
Original changes found in this commit https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca 3512bb085eb Conflicts: common/lib/xmodule/xmodule/textannotation_module.py common/lib/xmodule/xmodule/videoannotation_module.py
lduarte1991 committed -
Reverting commit @3bfb633f and updating openseadragon.js for latest build Conflicts: common/lib/xmodule/xmodule/imageannotation_module.py common/lib/xmodule/xmodule/textannotation_module.py common/lib/xmodule/xmodule/videoannotation_module.py
lduarte1991 committed -
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
lduarte1991 committed -
Annotation Tools: Load Tinymce in student_view Annotation Tools: Fixing tests for student_view Fixed typo from autocomplete Fixed dict for tests
lduarte1991 committed
-
- 10 Jun, 2014 4 commits
-
-
Diana Huang committed
-
Fix performance regression
Sarina Canelake committed -
Flowerhack/conditional module rendering
Julia Hansbrough committed -
Julia Hansbrough committed
-
- 09 Jun, 2014 22 commits
-
-
Sarina/other ok fixes
Sarina Canelake committed -
Sarina/fix openended logging
Sarina Canelake committed -
Sarina Canelake committed
-
Diana Huang committed
-
Sarina Canelake committed
-
Calen Pennington committed
-
Julia Hansbrough committed
-
Julia Hansbrough committed
-
Calen Pennington committed
-
Don Mitchell committed
-
Don Mitchell committed
-
Julia Hansbrough committed
-
Julia Hansbrough committed
-
Julia Hansbrough committed
-
Calen Pennington committed
-
Diana Huang committed
-
Diana Huang committed
-
Don Mitchell committed
-
Don Mitchell committed
-
Don Mitchell committed
-
because keys are immutable
Don Mitchell committed -
Remove course_from_id don't fetch whole course when the root will do don't fetch even the root if the id will do check for definition.data == null
Don Mitchell committed
-
- 04 Jun, 2014 1 commit
-
-
Fixes BLD-1104
Adam committed
-
- 03 Jun, 2014 1 commit
-
-
Dave St.Germain committed
-
- 29 May, 2014 4 commits
-
-
Don Mitchell committed
-
Don Mitchell committed
-
Calen Pennington committed
-
Conflicts: cms/djangoapps/contentstore/tests/test_course_listing.py
Don Mitchell committed
-
