- 28 Jun, 2014 3 commits
- 26 Jun, 2014 2 commits
-
-
Impose the following restrictions on setting up sneakpeek * Has to be a GET * Cannot be a machine callback to handler from xqueue or xblock * Cannot be trying to list the LTI endpoints
Jason Bau committed -
Bugfix for the following condition: When anonymous (e.g., non-registered) access is enabled for a course, and that course also uses the /request_certificate endpoint (e.g., via the "Grade Me" button), anonymous users could request to be graded and given certificates. As a matter of policy, Stanford doesn't want to give certificates to anonymous students. Also adds defensive error checks in several more places.
Joe Blaylock committed
-
- 25 Jun, 2014 10 commits
-
-
Adds /instructor/api/irc_instructor_auth_token API endpoint which returns a JSON blob including a per-course magic key iff the logged-in user is an instructor in the course.
Joe Blaylock committed -
Giulio Gratta committed
-
Squashing commits Transition to Oqaque Keys Bug fixes Fixing regenerate_user
Han Su Kim committed -
stv committed
-
- Use OpaqueKeys exception - Remove unused imports - Clean up syntax - Remove superfluous print statment
stv committed -
There is a bug I need to fix when a student re-visits a problem that they had solved previously without masking enabled, their old state does not load correclty. It's simplest to turn off masking now, and re-enable it with the whole fix. The change here is a small deletion to remove the masking=True logic, and more lengthy changes to adjust the tests.
Nick Parlante committed -
conditionally do template includes to fix lms tests
Jason Bau committed -
stv committed
-
Jason Bau committed
-
stv committed
-
- 24 Jun, 2014 12 commits
-
-
Jason Bau committed
-
Conflicts: common/djangoapps/student/views.py lms/djangoapps/courseware/views.py
Jason Bau committed -
Conflicts: lms/djangoapps/courseware/views.py
Giulio Gratta committed -
Fixes some stuff in metrics tab Fixes some 500s after opaque-keys Adds a test which would have caught the 500s Fixes Transifex problem on the string % of students
David Adams committed -
These had been failing for a while.
stv committed -
stv committed
-
This shouldn't have been 404'ing...
stv committed -
stv committed
-
Jbau/lti/customizable
Jason Bau committed -
Jason Bau committed
-
middleware for CMS logging out all sneakpeek users
Jason Bau committed -
Jason Bau committed
-
- 23 Jun, 2014 2 commits
- 20 Jun, 2014 1 commit
-
-
Conflicts: cms/djangoapps/contentstore/views/checklist.py cms/templates/index.html cms/templates/widgets/header.html cms/templates/widgets/sock.html cms/urls.py common/djangoapps/student/views.py common/lib/capa/capa/tests/test_targeted_feedback.py common/lib/xmodule/xmodule/course_module.py common/lib/xmodule/xmodule/lti_module.py common/lib/xmodule/xmodule/tests/test_lti20_unit.py lms/djangoapps/certificates/queue.py lms/djangoapps/certificates/views.py lms/djangoapps/class_dashboard/dashboard_data.py lms/djangoapps/class_dashboard/tests/test_dashboard_data.py lms/djangoapps/courseware/access.py lms/djangoapps/courseware/features/lti.feature lms/djangoapps/courseware/models.py lms/djangoapps/courseware/module_render.py lms/djangoapps/courseware/tests/test_access.py lms/djangoapps/courseware/tests/test_courses.py lms/djangoapps/courseware/tests/test_lti_integration.py lms/djangoapps/courseware/tests/test_module_render.py lms/djangoapps/courseware/views.py lms/djangoapps/instructor/views/instructor_dashboard.py lms/templates/courseware/course_navigation.html lms/templates/dashboard/_dashboard_course_listing.html lms/templates/navigation.html requirements/edx/github.txt
stv committed
-
- 16 Jun, 2014 1 commit
-
-
Jason Bau committed
-
- 11 Jun, 2014 9 commits
-
-
Giulio/unauth tos footer style
Sef Kloninger committed -
Hotfix 2014-06-11
Sarina Canelake committed -
Giulio Gratta 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
-