Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,386 Commits 1 Branch 0 Tags
faeee559fd39d4c5d2779fa6a713be1bad7c16ff
Commit Graph

23386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarina Canelake
faeee559fd Fix Instructor Dash UX (LMS-2748) 2014-05-22 16:53:20 -04:00
Diana Huang
a69e42dd5a Merge pull request #3830 from edx/diana/fix-cohorting 
Fix cohorting views
 2014-05-22 12:13:15 -04:00
Diana Huang
ae95e07cce Deserialze values coming into course_groups views 2014-05-22 12:11:48 -04:00
Calen Pennington
fb65aad11e Merge pull request #3826 from cpennington/ok-use-deprecated-for-instructor-api 
Use old deprecated form for instructor api calls, and in staff debug info
 2014-05-22 12:07:16 -04:00
Sarina Canelake
c7bf96f048 Merge pull request #3822 from edx/sarina/course-modes-display 
Sarina/course modes display
 2014-05-22 11:40:15 -04:00
Calen Pennington
8699a13b09 Use old deprecated form for instructor api calls, and in staff debug info 2014-05-22 11:24:05 -04:00
Don Mitchell
1223c8a08d has_course was incorrect, fixed 2014-05-22 10:52:24 -04:00
Don Mitchell
253ed3b855 Merge pull request #3820 from edx/dhm/bug_ok_serial_numbers 
Dhm/bug ok serial numbers
 2014-05-22 09:36:43 -04:00
Calen Pennington
ba59e3b8a5 fixup! Serial number commands deserialize course keys 2014-05-22 09:06:13 -04:00
Nimisha Asthagiri
0631c6358c Merge pull request #3821 from edx/ok-permissions-asserts 
Added asserts to ensure course_ids are course key objects.
 2014-05-22 08:47:01 -04:00
Calen Pennington
4b69cf5472 Merge pull request #3810 from cpennington/ok-management-commands 
Fix management commands
 2014-05-21 21:53:43 -04:00
Calen Pennington
942c2eab30 Merge pull request #3815 from cpennington/ok-certificaties 
Fix certificate requests
 2014-05-21 21:52:54 -04:00
Calen Pennington
76953d7223 Merge pull request #3807 from cpennington/ok-cleaner-logging 
Clean up logging in import_export.py
 2014-05-21 20:36:48 -04:00
Calen Pennington
75ad81bea3 Merge pull request #3813 from cpennington/ok-mongoengine-fields 
Make mongoengine field for UsageKeys expect a Location
 2014-05-21 20:35:55 -04:00
Sarina Canelake
4723467345 Validate forms to allow old and new style course key serialization syntax 2014-05-21 17:44:50 -04:00
Nimisha Asthagiri
d43386a0c6 Added asserts to ensure course_ids are course key objects. 2014-05-21 17:20:56 -04:00
Don Mitchell
30184dbd68 Serial number commands deserialize course keys 2014-05-21 16:58:04 -04:00
Don Mitchell
bef8134eea Merge pull request #3806 from edx/dhm/opaque_migrate_0036 
Migration for role_coursenum deprecated roles
 2014-05-21 16:33:33 -04:00
Calen Pennington
708d758d65 Merge pull request #3808 from cpennington/ok-course-mode-errors 
Call other CourseModeView methods using serialized course_id
 2014-05-21 16:21:27 -04:00
Calen Pennington
1f9c7b2ed4 Merge pull request #3809 from cpennington/ok-dead-code 
Remove dead code
 2014-05-21 16:21:17 -04:00
Calen Pennington
1c60da02df fixup! Fix management commands 2014-05-21 16:20:46 -04:00
Calen Pennington
32e0387fa0 Merge pull request #3811 from cpennington/ok-dont-use-empty 
Don't use Empty directly, let the manager handle it
 2014-05-21 16:14:42 -04:00
Calen Pennington
61e621fc6e Merge pull request #3812 from cpennington/ok-simpler-loc-mapper 
Make the arguments to translate_location_to_course_locator more specific
 2014-05-21 16:12:27 -04:00
Calen Pennington
3b58997b82 Merge pull request #3814 from cpennington/ok-conditional-test 
Fix ConditionalTest test system
 2014-05-21 16:10:56 -04:00
Calen Pennington
4c3c8a9a2e Fix certificate requests 2014-05-21 16:10:16 -04:00
Calen Pennington
150b5cd298 Merge pull request #3816 from cpennington/ok-psychometrics 
Fix PsychometricData query
 2014-05-21 16:09:46 -04:00
Calen Pennington
d52c58c77b Fix PsychometricData query 2014-05-21 14:48:25 -04:00
Calen Pennington
c62b6b0083 Fix ConditionalTest test system 2014-05-21 14:44:46 -04:00
Calen Pennington
4c2e612aeb Make mongoengine field for UsageKeys expect a Location 2014-05-21 14:43:51 -04:00
Calen Pennington
4836252972 Make the arguments to translate_location_to_course_locator more specific 2014-05-21 14:39:28 -04:00
Calen Pennington
06d680cded Don't use Empty directly, let the manager handle it 2014-05-21 14:38:16 -04:00
Calen Pennington
1f849e441d Fix management commands 2014-05-21 14:36:41 -04:00
Calen Pennington
4af2249a9d Remove dead code 2014-05-21 14:28:04 -04:00
Calen Pennington
3d90c83199 Call other CourseModeView methods using serialized course_id 2014-05-21 14:27:01 -04:00
Calen Pennington
7f8543a2e4 Clean up logging in import_export.py 2014-05-21 14:25:21 -04:00
Don Mitchell
9af40ae2cc Migration for role_coursenum deprecated roles 2014-05-21 12:03:09 -04:00
Calen Pennington
4df73548bf Merge pull request #3788 from cpennington/allow-cross-course-references 
Allow cross course references in the LMS
 2014-05-21 11:06:01 -04:00
Calen Pennington
39e264041e Merge pull request #3778 from cpennington/mixed-modulestore-bad-keys 
Handle malformed keys in MixedModuleStore configuration
 2014-05-21 11:05:50 -04:00
Don Mitchell
50d66be2a1 Merge pull request #3792 from edx/dhm/bug_ora_peer_grading 
Fix student progress @sarina bug
 2014-05-20 18:12:22 -04:00
Don Mitchell
c085578383 Fix student progress @sarina bug 2014-05-20 18:08:33 -04:00
Don Mitchell
3ab925a178 Merge pull request #3787 from edx/dhm/bug_mktg_url 
marketing url too many slashes
 2014-05-20 13:56:16 -04:00
Calen Pennington
c092118d56 Merge pull request #3781 from cpennington/opaque-keys-more-docs 
Add autodocs of modulestores
 2014-05-20 13:55:25 -04:00
Don Mitchell
115f5b2cd1 Merge pull request #3791 from edx/dhm/bug_open_ended_notifications 
Dhm/bug open ended notifications
 2014-05-20 13:39:27 -04:00
Don Mitchell
08aaa97bfb Serialize course_key at last possible code junction 2014-05-20 11:58:03 -04:00
Don Mitchell
f7558c40e8 Fixes ../courseware/Peer_Grading_Panel/peergrading:L12P5_grading/ reported bug 2014-05-20 11:44:51 -04:00
Calen Pennington
76235c1027 Allow cross course references in the LMS 2014-05-20 11:44:09 -04:00
Sarina Canelake
9dc48c00b4 Merge pull request #3779 from edx/sarina/fix-grades-management-commands 
Sarina/fix grades management commands
 2014-05-20 11:35:54 -04:00
Don Mitchell
80552674b3 Merge pull request #3786 from edx/dhm/bug_cohort_args 
Dhm/bug cohort args
 2014-05-20 11:23:22 -04:00
Don Mitchell
591fc2b547 Fixes Carlos's bug 2014-05-20 11:15:10 -04:00
Don Mitchell
e2332d1922 Fix old dashboard list cohorts 2014-05-20 10:37:03 -04:00