Commits · a69e42dd5a6b3a012411f85063981734ff836582 · edx / edx-platform · GitLab

22 May, 2014 13 commits
- Merge pull request #3830 from edx/diana/fix-cohorting · a69e42dd
```
Fix cohorting views
```
  Diana Huang committed May 22, 2014
  a69e42dd Browse Files
- Deserialze values coming into course_groups views · ae95e07c
  Diana Huang committed May 22, 2014
  
  ae95e07c Browse Files
- Merge pull request #3826 from cpennington/ok-use-deprecated-for-instructor-api · fb65aad1
```
Use old deprecated form for instructor api calls, and in staff debug info
```
  Calen Pennington committed May 22, 2014
  fb65aad1 Browse Files
- Merge pull request #3822 from edx/sarina/course-modes-display · c7bf96f0
```
Sarina/course modes display
```
  Sarina Canelake committed May 22, 2014
  c7bf96f0 Browse Files
- Use old deprecated form for instructor api calls, and in staff debug info · 8699a13b
  Calen Pennington committed May 22, 2014
  
  8699a13b Browse Files
- has_course was incorrect, fixed · 1223c8a0
  Don Mitchell committed May 22, 2014
  
  1223c8a0 Browse Files
- Merge pull request #3820 from edx/dhm/bug_ok_serial_numbers · 253ed3b8
```
Dhm/bug ok serial numbers
```
  Don Mitchell committed May 22, 2014
  253ed3b8 Browse Files
- fixup! Serial number commands deserialize course keys · ba59e3b8
  Calen Pennington committed May 22, 2014
  
  ba59e3b8 Browse Files
- Merge pull request #3821 from edx/ok-permissions-asserts · 0631c635
```
Added asserts to ensure course_ids are course key objects.
```
  Nimisha Asthagiri committed May 22, 2014
  0631c635 Browse Files
- Merge pull request #3810 from cpennington/ok-management-commands · 4b69cf54
```
Fix management commands
```
  Calen Pennington committed May 21, 2014
  4b69cf54 Browse Files
- Merge pull request #3815 from cpennington/ok-certificaties · 942c2eab
```
Fix certificate requests
```
  Calen Pennington committed May 21, 2014
  942c2eab Browse Files
- Merge pull request #3807 from cpennington/ok-cleaner-logging · 76953d72
```
Clean up logging in import_export.py
```
  Calen Pennington committed May 21, 2014
  76953d72 Browse Files
- Merge pull request #3813 from cpennington/ok-mongoengine-fields · 75ad81be
```
Make mongoengine field for UsageKeys expect a Location
```
  Calen Pennington committed May 21, 2014
  75ad81be Browse Files
21 May, 2014 24 commits
- Validate forms to allow old and new style course key serialization syntax · 47234673
  Sarina Canelake committed May 21, 2014
  
  47234673 Browse Files
- Added asserts to ensure course_ids are course key objects. · d43386a0
  Nimisha Asthagiri committed May 21, 2014
  
  d43386a0 Browse Files
- Serial number commands deserialize course keys · 30184dbd
  Don Mitchell committed May 21, 2014
  
  30184dbd Browse Files
- Merge pull request #3806 from edx/dhm/opaque_migrate_0036 · bef8134e
```
Migration for role_coursenum deprecated roles
```
  Don Mitchell committed May 21, 2014
  bef8134e Browse Files
- Merge pull request #3808 from cpennington/ok-course-mode-errors · 708d758d
```
Call other CourseModeView methods using serialized course_id
```
  Calen Pennington committed May 21, 2014
  708d758d Browse Files
- Merge pull request #3809 from cpennington/ok-dead-code · 1f9c7b2e
```
Remove dead code
```
  Calen Pennington committed May 21, 2014
  1f9c7b2e Browse Files
- fixup! Fix management commands · 1c60da02
  Calen Pennington committed May 21, 2014
  
  1c60da02 Browse Files
- Merge pull request #3811 from cpennington/ok-dont-use-empty · 32e0387f
```
Don't use Empty directly, let the manager handle it
```
  Calen Pennington committed May 21, 2014
  32e0387f Browse Files
- Merge pull request #3812 from cpennington/ok-simpler-loc-mapper · 61e621fc
```
Make the arguments to translate_location_to_course_locator more specific
```
  Calen Pennington committed May 21, 2014
  61e621fc Browse Files
- Merge pull request #3814 from cpennington/ok-conditional-test · 3b58997b
```
Fix ConditionalTest test system
```
  Calen Pennington committed May 21, 2014
  3b58997b Browse Files
- Fix certificate requests · 4c3c8a9a
  Calen Pennington committed May 21, 2014
  
  4c3c8a9a Browse Files
- Merge pull request #3816 from cpennington/ok-psychometrics · 150b5cd2
```
Fix PsychometricData query
```
  Calen Pennington committed May 21, 2014
  150b5cd2 Browse Files
- Fix PsychometricData query · d52c58c7
  Calen Pennington committed May 21, 2014
  
  d52c58c7 Browse Files
- Fix ConditionalTest test system · c62b6b00
  Calen Pennington committed May 21, 2014
  
  c62b6b00 Browse Files
- Make mongoengine field for UsageKeys expect a Location · 4c2e612a
  Calen Pennington committed May 21, 2014
  
  4c2e612a Browse Files
- Make the arguments to translate_location_to_course_locator more specific · 48362529
  Calen Pennington committed May 21, 2014
  
  48362529 Browse Files
- Don't use Empty directly, let the manager handle it · 06d680cd
  Calen Pennington committed May 21, 2014
  
  06d680cd Browse Files
- Fix management commands · 1f849e44
  Calen Pennington committed May 21, 2014
  
  1f849e44 Browse Files
- Remove dead code · 4af2249a
  Calen Pennington committed May 21, 2014
  
  4af2249a Browse Files
- Call other CourseModeView methods using serialized course_id · 3d90c831
  Calen Pennington committed May 21, 2014
  
  3d90c831 Browse Files
- Clean up logging in import_export.py · 7f8543a2
  Calen Pennington committed May 21, 2014
  
  7f8543a2 Browse Files
- Migration for role_coursenum deprecated roles · 9af40ae2
  Don Mitchell committed May 21, 2014
  
  9af40ae2 Browse Files
- Merge pull request #3788 from cpennington/allow-cross-course-references · 4df73548
```
Allow cross course references in the LMS
```
  Calen Pennington committed May 21, 2014
  4df73548 Browse Files
- Merge pull request #3778 from cpennington/mixed-modulestore-bad-keys · 39e26404
```
Handle malformed keys in MixedModuleStore configuration
```
  Calen Pennington committed May 21, 2014
  39e26404 Browse Files
20 May, 2014 3 commits
- Merge pull request #3792 from edx/dhm/bug_ora_peer_grading · 50d66be2
```
Fix student progress @sarina bug
```
  Don Mitchell committed May 20, 2014
  50d66be2 Browse Files
- Fix student progress @sarina bug · c0855783
  Don Mitchell committed May 20, 2014
  
  c0855783 Browse Files
- Merge pull request #3787 from edx/dhm/bug_mktg_url · 3ab925a1
```
marketing url too many slashes
```
  Don Mitchell committed May 20, 2014
  3ab925a1 Browse Files