Commits · 56b7b7007e69f256bd310655a83bec3578612507 · edx / edx-platform

20 Oct, 2015 11 commits

Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2 · 56b7b700
jsa committed Oct 20, 2015

56b7b700 Browse Files
Merge pull request #10225 from edx/zoldak/improve-learner-profile-test-code · 62633560
```
Improve acceptance test code for visiting the learner profile page
```
Jesse Zoldak committed Oct 20, 2015
62633560 Browse Files
Merge pull request #10217 from edx/zub/update-icrv-version-to-0.0.2 · 7fe813e6
```
update ICRV block version to 0.0.4
```
Zubair Afzal committed Oct 20, 2015
7fe813e6 Browse Files
Merge pull request #10123 from edx/afeef/bugfix/tnl-3505-country-embargo-end-run · f1ee8d69
```
TNL-3505 Country embargo end run. Invalidate cache when user changes country
```
Afeef Janjua committed Oct 20, 2015
f1ee8d69 Browse Files
Merge pull request #10265 from edx/saleem-latif/SOL-1314 · 92a845e1
```
SOL-1314: Add Cert link to Support dashboard
```
Matt Drayer committed Oct 20, 2015
92a845e1 Browse Files
Merge pull request #10263 from edx/tasawer/story/ecom-2554-credit-link-escaping-html · 022a8736
```
Remove escaping html from dashboard link
```
tasawernawaz committed Oct 20, 2015
022a8736 Browse Files

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit) · 713689df

Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[98d2415] added better log info message

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated

committed Oct 20, 2015

713689df Browse Files

added certificate web view link to Support Dashboard · aaf13b97
Saleem Latif committed Oct 20, 2015

aaf13b97 Browse Files
remove escaping html for dashboard link · cc6b4982
```
ECOM-2554
```
Tasawer committed Oct 20, 2015
cc6b4982 Browse Files
Merge pull request #10249 from edx/update-milestones-app-hash · ad889344
```
updated edx-milestones hash
```
Matt Drayer committed Oct 19, 2015
ad889344 Browse Files

ziafazal/updated-edx-milestones-hash: Bump to v0.1.3 · e500963c

* mattdrayer: Changed github.txt reference to use release tag
* mattdrayer: Updated to edx-milestones v0.1.3 (find_packages)

committed Oct 19, 2015

e500963c Browse Files

19 Oct, 2015 23 commits
- Merge pull request #10256 from mitocw/gdm_pylint_ccx_2 · 50959573
```
Fixed new pylint violations in lms/djangoapps/ccx
```
  Sarina Canelake committed Oct 19, 2015
  50959573 Browse Files
- Fixed new pylint violations in lms/djangoapps/ccx · 82a41b38
  Giovanni Di Milia committed Oct 19, 2015
  
  82a41b38 Browse Files
- Merge pull request #10182 from open-craft/logistration-translations · 8970eae7
```
Translate education/gender options in registration form LOC-73
```
  Sarina Canelake committed Oct 19, 2015
  8970eae7 Browse Files
- Merge pull request #10007 from open-craft/unenroll-course-name · 7b71f95f
```
Display course name in course unenroll confirmation popup.
```
  Sarina Canelake committed Oct 19, 2015
  7b71f95f 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
- LOC-73: Translate education/gender options in registration form. · 58e92b52
```
The education level and gender choices weren't being translated for
display on the combined login/registration form.
```
  Matjaz Gregoric committed Oct 19, 2015
  58e92b52 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
- update ICRV block version to 0.0.4 · e0678c60
  zubair-arbi committed Oct 19, 2015
  
  e0678c60 Browse Files
- Use %()s style variable placeholder for cert name. · 90274746
```
Some strings were using both python-style {} placeholders as well
as javascript-style %()s placeholders. That can be confusing for
translators.

Replace the python-style placeholder with a %()s one and interpolate
the value using javascript.
```
  Matjaz Gregoric committed Oct 19, 2015
  90274746 Browse Files
- Display course name in unenroll popup. · 5acd203d
```
Only the course number was displayed in the course unenrollment
confirmation popup dialog.

Include full course display name to make it more user friendly.
```
  Matjaz Gregoric committed Oct 19, 2015
  5acd203d 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

Remove unused specs · ca99606f

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 5 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