Commits · 0c9d687fc9635eb690e1e94171a083aa64fd9163 · edx / edx-platform · GitLab

16 Jan, 2015 18 commits
- One place in the new library code that used the old user service · 0c9d687f
  Ned Batchelder committed Jan 16, 2015
  
  0c9d687f Browse Files
- Pylint fixes to make diff-quality happy · df0e3e64
  Ned Batchelder committed Jan 16, 2015
  
  df0e3e64 Browse Files
- Implement user service to return currently-logged-in user · 7f1b60b2
```
returns XBlockuser with 2 data layers
```
  Jason Bau committed Jan 16, 2015
  7f1b60b2 Browse Files
- User service PR: fix unrelated courseware test · dd18a8e6
```
Makes lms/djangoapps/courseware/tests/test_views.py:test_index_invalid_position
actually do what it intends to do, but fixing the URL the
test client visits
```
  Jason Bau committed Jan 16, 2015
  dd18a8e6 Browse Files
- Merge pull request #6658 from edx/will/ECOM-894 · 314ad957
```
ECOM-894: Allow inactive users to request a password reset
```
  Will Daly committed Jan 16, 2015
  314ad957 Browse Files
- Merge pull request #6671 from edx/clytwynec/disable_flaky_tests · 0ed43e14
```
disable DragAndDropTest
```
  Christine Lytwynec committed Jan 16, 2015
  0ed43e14 Browse Files
- Merge pull request #6625 from Stanford-Online/jbau/small-shib-bugfix · 94b313fd
```
Fix shib code to handle course.enrollment_domain=None
```
  Sarina Canelake committed Jan 16, 2015
  94b313fd Browse Files
- disable DragAndDropTest · 625eae27
  Christine Lytwynec committed Jan 16, 2015
  
  625eae27 Browse Files
- Merge pull request #6669 from edx/clytwynec/disable_flaky_tests · 17d593ae
```
Clytwynec/disable flaky tests
```
  Christine Lytwynec committed Jan 16, 2015
  17d593ae Browse Files
- Merge pull request #6514 from johnjlee/schoolyourself-xblock · 94ce3c0a
```
Minor fixes to the schoolyourself xblock
```
  Ned Batchelder committed Jan 16, 2015
  94ce3c0a Browse Files
- disable test_settings_overrides · c2f3e7a1
  Christine Lytwynec committed Jan 16, 2015
  
  c2f3e7a1 Browse Files
- disable test_prerequisite_course_save_successfully · 85650da2
  Christine Lytwynec committed Jan 16, 2015
  
  85650da2 Browse Files
- Allow inactive users to request a password reset · 82283370
```
Internationalize error messages for password reset on the new login page.
```
  Will Daly committed Jan 16, 2015
  82283370 Browse Files
- Merge pull request #6582 from edx/waheed/tnl935-fix-transcript-skip-first-line · 5958ffb3
```
Fixed transcript skip first line if it contains BOM(Byte Order Mark).
```
  Waheed Ahmed committed Jan 16, 2015
  5958ffb3 Browse Files
- Fixed transcript skip first line if it contains BOM(Byte Order Mark). · 47a37228
```
TNL-935
```
  Waheed Ahmed committed Jan 16, 2015
  47a37228 Browse Files
- Merge pull request #6647 from edx/renzo/split-payment-verification-acceptance-tests · 2db00c57
```
Bok Choy tests for the split payment and verification flow
```
  Renzo Lucioni committed Jan 16, 2015
  2db00c57 Browse Files
- Merge pull request #6455 from edx/mattdrayer/entrance-exams · b59566a3
```
(WIP) Course Entrance Exams
```
  Matt Drayer committed Jan 15, 2015
  b59566a3 Browse Files
- New feature contribution: Entrance Exams · 3c669e38
  Matt Drayer committed Jan 15, 2015
  
  3c669e38 Browse Files
15 Jan, 2015 22 commits
- Bok Choy tests for the split payment and verification flow · c6777a5b
```
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
```
  Renzo Lucioni committed Jan 15, 2015
  c6777a5b Browse Files
- Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app · 27fee620
```
Ziafazal/add pre requisite course via milestones app
```
  Matt Drayer committed Jan 15, 2015
  27fee620 Browse Files
- Merge pull request #6541 from edx/will/update-diff-cover · 572f155a
```
Install diff-cover from pypi, update version to 0.7.3
```
  Will Daly committed Jan 15, 2015
  572f155a Browse Files
- Merge pull request #6656 from edx/update-readme-link · ca1ba205
```
Update README link for full stack installation
```
  David Baumgold committed Jan 15, 2015
  ca1ba205 Browse Files
- Update README link for full stack installation · 591c0f63
  David Baumgold committed Jan 15, 2015
  
  591c0f63 Browse Files
- Merge pull request #6624 from mitocw/bdero/sysadmin-dashboard-link · 68b18a20
```
Add link to sysadmin dashboard on core theme
```
  Sarina Canelake committed Jan 15, 2015
  68b18a20 Browse Files
- Merge pull request #6654 from edx/merge-release-into-master · b9bd6598
```
Merge release into master
```
  Adam committed Jan 15, 2015
  b9bd6598 Browse Files
- New pre-requisite course feature via milestones app · ca3d84a5
  Zia Fazal committed Jan 15, 2015
  
  ca3d84a5 Browse Files
- Merge pull request #6583 from… · c4cd94d7
```
Merge pull request #6583 from edx/muhhshoaib/shoppingcart-redemption-page-cross-browser-compatibility-fix

fix the redemption page cross browser issue on safari
```
  chrisndodge committed Jan 15, 2015
  c4cd94d7 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · 4381ccd4
  Adam Palay committed Jan 15, 2015
  
  4381ccd4 Browse Files
- Merge pull request #6648 from edx/hotfix/2015-01-15 · c281096f
```
Fixed unicode error in CSV grade report generation.
```
  Adam committed Jan 15, 2015
  c281096f Browse Files
- Merge pull request #6649 from jzoldak/zoldak/fix-yt-stub · adc64122
```
Request the iframe API from youtube in tests every time it is needed
```
  Jesse Zoldak committed Jan 15, 2015
  adc64122 Browse Files
- Merge pull request #6645 from edx/aamir-khan/ECOM-887-post-payment-message · 5959edb4
```
ECOM-887 Removed the "We have successfully verified your identity" line.
```
  Awais Qureshi committed Jan 15, 2015
  5959edb4 Browse Files
- Request the iframe API from youtube in tests every time it is needed · 3bdee98f
```
TNL-454
```
  Jesse Zoldak committed Jan 15, 2015
  3bdee98f Browse Files
- Merge pull request #6604 from edx/markhoeber-developer-guide-move · c95d90a3
```
Notice on Developer's Guide move
```
  Mark Hoeber committed Jan 15, 2015
  c95d90a3 Browse Files
- Merge pull request #6646 from edx/missed-an-ellipses · b3fda9c5
```
Missed an ellipsis
```
  David Baumgold committed Jan 15, 2015
  b3fda9c5 Browse Files
- add back inclusion of the receipt_custom_pane.html at the bottom of the receipt page · 1fcca3a9
  Chris Dodge committed Jan 15, 2015
  
  1fcca3a9 Browse Files
- Merge pull request #6299 from edx/cohorted-courseware · 2897a8ef
```
Cohorted courseware
```
  Christina Roberts committed Jan 15, 2015
  2897a8ef Browse Files
- Fixed unicode error in CSV grade report generation. · 373f8e82
```
TNL-1196
```
  Waheed Ahmed committed Jan 15, 2015
  373f8e82 Browse Files
- Merge pull request #6478 from edx/jeskew/change_handled_exception_for_assets · 9e20057d
```
Handle the correct exception upon asset not found.
```
  John Eskew committed Jan 15, 2015
  9e20057d Browse Files
- use bulk_ops on course_about · 0049c97d
  jsa committed Jan 15, 2015
  
  0049c97d Browse Files
- Remove unnecessary pylint suppression. · 9607aa23
```
Possibly caused by a bad merge.
```
  cahrens committed Jan 15, 2015
  9607aa23 Browse Files