Commits · bb5b1000e198c4967596dc283ae543dacb95f7d5 · edx / edx-platform

19 Oct, 2015 16 commits
- Revert "Reserve ecommerce service username on edx-platform." · bb5b1000
```
Bad data migration: assumes the email address being used is unique
This reverts commit 448f4d51.
```
  AlasdairSwan committed Oct 19, 2015
  bb5b1000 Browse Files
- Merge pull request #10246 from edx/merge-release-into-master · ab78069a
```
Merge release into master
```
  Adam committed Oct 19, 2015
  ab78069a Browse Files
- Merge pull request #10191 from IONISx/tusbar/fix-shopping-cart-default-dates · 8f142339
```
TNL-3611: Remove shoppingcart default date values
```
  Ned Batchelder committed Oct 19, 2015
  8f142339 Browse Files
- Merge pull request #27 from edx/ned/add-migration-to-pr-10191 · 889f0686
```
Add needed migration
```
  Bertrand Marron committed Oct 19, 2015
  889f0686 Browse Files
- Add needed migration for datetime default change · 8fcb048b
  Ned Batchelder committed Oct 19, 2015
  
  8fcb048b Browse Files
- Merge pull request #10156 from edx/mattdrayer/increment-edx-lint · f55542c5
```
mattdrayer/increment-edx-lint: Bump to v0.2.9
```
  Matt Drayer committed Oct 19, 2015
  f55542c5 Browse Files
- Merge pull request #10126 from edx/asadiqbal08/SOL-1288 · a4cc266c
```
asadiqbal08/SOL-1288 Add view of Certs generated to the Instructor Dashboard
```
  Matt Drayer committed Oct 19, 2015
  a4cc266c Browse Files
- mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations · 1eab25f2
```
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
```
  Matt Drayer committed Oct 19, 2015
  1eab25f2 Browse Files
- Merge pull request #10238 from edx/saleem-latif/SOL-1297-feedback-changes · d7c8cb80
```
SOL-1297: Remove platform name from error message in Certificates Web View
```
  Matt Drayer committed Oct 19, 2015
  d7c8cb80 Browse Files
- Merge pull request #10215 from edx/ziafazal/SOL-1317 · c30960cc
```
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
```
  Matt Drayer committed Oct 19, 2015
  c30960cc Browse Files
- Merge pull request #10146 from edx/saleem-latif/SOL-1257 · b4ff9f88
```
saleem-latif/SOL-1257: Resetting student history for Entrance Exam on instructor dashboard
```
  Matt Drayer committed Oct 19, 2015
  b4ff9f88 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-into-master · 9b3841f6
```
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
```
  Adam Palay committed Oct 19, 2015
  9b3841f6 Browse Files
- Merge pull request #10237 from stvstnfrd/noop-tests · aed32a09
```
Remove unused specs
```
  Christina Roberts committed Oct 19, 2015
  aed32a09 Browse Files
- SOL-1288 · 74b08249
  asadiqbal committed Oct 19, 2015
  
  74b08249 Browse Files
- Remove milestones when instructor clears a student's entry exam data · 12b245a3
  Saleem Latif committed Oct 19, 2015
  
  12b245a3 Browse Files
- feedback changes · 3502738b
  Saleem Latif committed Oct 19, 2015
  
  3502738b Browse Files
18 Oct, 2015 1 commit

These have been commented-out for more than 2 and a half years;
I can't think of a legitimate reason for keeping them around at this
point.

These were originally commented out here in
47409654

committed Oct 18, 2015

ca99606f Browse Files

16 Oct, 2015 16 commits
- Merge pull request #9845 from edx/christina/bio-hyperlink · 300bd431
```
Make HTML for non-editable views on leaner profile page more logical
```
  Christina Roberts committed Oct 16, 2015
  300bd431 Browse Files
- profile page style cleanup · 113cab87
```
remove link style, add pointer, adjust spacing on profile
```
  Frances Botsford committed Oct 16, 2015
  113cab87 Browse Files
- Merge pull request #10195 from edx/hotfix/2015-10-15 · 3a61cca7
```
Hotfix/2015 10 15
```
  Adam committed Oct 16, 2015
  3a61cca7 Browse Files
- Merge pull request #10147 from edx/saleem-latif/SOL-1266-feedback-changes · 83734989
```
saleem-latif/SOL-1266: Move Course Number and Course Number Override below Course Title section
```
  Matt Drayer committed Oct 16, 2015
  83734989 Browse Files
- Merge pull request #10170 from mitocw/gdm_fix_pylint_lms.djangoapps.ccx · a72425c8
```
Fixed pylint violation for files in lms/djangoapps/ccx
```
  Sarina Canelake committed Oct 16, 2015
  a72425c8 Browse Files
- Fixed pylint violation for files in lms/djangoapps/ccx · 220c1e29
  Giovanni Di Milia committed Oct 16, 2015
  
  220c1e29 Browse Files
- Make HTML for non-editable views more logical. · c6ba7474
```
TNL-3297
```
  cahrens committed Oct 16, 2015
  c6ba7474 Browse Files
- Merge pull request #10226 from edx/adam/skip-test-if-third-party-auth-not-installed · 5ec3d83d
```
skip LTIConfig test when third_party_auth is not installed
```
  Adam committed Oct 16, 2015
  5ec3d83d Browse Files
- Merge pull request #10222 from edx/mashtaq/fix-quality-template-escaping · 387d4f6a
```
Fix quality for template escaping
```
  Adam committed Oct 16, 2015
  387d4f6a Browse Files
- skip LTIConfig test when third_party_auth is not installed · 9a79bf2e
  Adam Palay committed Oct 16, 2015
  
  9a79bf2e Browse Files
- Fix quality for template escaping · 1b49f0cd
  Mushtaq Ali committed Oct 16, 2015
  
  1b49f0cd Browse Files
- Merge pull request #10218 from edx/sarina/20151016-update-translations · d367f7ad
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Oct 16, 2015
  d367f7ad Browse Files
- Update translations (autogenerated message) · 6e47cbfb
  Sarina Canelake committed Oct 16, 2015
  
  6e47cbfb Browse Files
- check MILESTONES_APP when checking prerequisite courses enabled · 0f637fdc
  Zia Fazal committed Oct 16, 2015
  
  0f637fdc Browse Files
- Changes after testing on staging · 5f766f38
  Saleem Latif committed Oct 16, 2015
  
  5f766f38 Browse Files
- Merge pull request #10201 from mitocw/gdm_fix_pylint_lms.djangoapps.certificates · d26d03da
```
Fixed pylint violation for files in lms/djangoapps/certificates
```
  Matt Drayer committed Oct 16, 2015
  d26d03da Browse Files
15 Oct, 2015 7 commits
- Merge pull request #10129 from edx/benp/more-unique-cohort-bokchoy · c54de688
```
Make these tests more unique for multiprocessing.
```
  Ben Patterson committed Oct 15, 2015
  c54de688 Browse Files
- Merge pull request #10183 from edx/ahsan/ECOM-2551-Update-Credit-Eligibility-Table-for-Skips · da9f0f23
```
Update Credit Requirement Status Table for Skips
```
  Ahsan Ulhaq committed Oct 16, 2015
  da9f0f23 Browse Files
- Merge pull request #10154 from edx/saleem-latif/SOL-1297 · f1951df2
```
saleem-latif/SOL-1297: updated message for 500 error on certificate preview
```
  Matt Drayer committed Oct 15, 2015
  f1951df2 Browse Files
- Merge pull request #10193 from edx/christina/move-require-test · 50fd135c
```
Clean up of common JS specs using RequireJS.
```
  Christina Roberts committed Oct 15, 2015
  50fd135c Browse Files
- Fixed pylint violation for files in lms/djangoapps/certificates · 476f6821
  Giovanni Di Milia committed Oct 15, 2015
  
  476f6821 Browse Files
- Move main_requirejs to live with the requirejs files. · b67f07af
  cahrens committed Oct 15, 2015
  
  b67f07af Browse Files
- Move edx.utils.validate. · a099ff86
```
The test was not running where it lived before.
```
  cahrens committed Oct 15, 2015
  a099ff86 Browse Files