Arbab Nazar
034ac1c808
Merge pull request #10271 from edx/arbab/enrollment-user-list
...
take the list of users for enrolment change
2015-10-21 08:24:48 -04:00
tasawernawaz
b50daf5f12
Merge pull request #10184 from edx/tasawer/story/ecom-2552-turn-off-mail-for-icrv
...
New Model added for Configuration of ICRV status emails.
2015-10-21 10:22:25 +05:00
Sarina Canelake
15d1aa3ad4
Merge pull request #10257 from edx/sarina/update-profile-wording
...
Create distinct terms for gender, education sign up terms
2015-10-20 20:06:14 -04:00
Nimisha Asthagiri
970efb04d9
Merge pull request #10046 from edx/cdyer/MA-1416-image-mimetype-uploads
...
MA-1416 image mimetype uploads
2015-10-20 19:16:24 -04:00
Sarina Canelake
105d611cc9
Create distinct terms for gender, education sign up terms
2015-10-20 18:55:51 -04:00
Christine Lytwynec
5f528ddd16
Merge pull request #10244 from edx/clytwynec/update-testing-docs
...
update testing.rst
2015-10-20 15:50:30 -04:00
arbabnazar
85e67bea4a
help updated
2015-10-20 15:37:09 -04:00
arbabnazar
b3e37e54ba
remove the append action
2015-10-20 15:30:06 -04:00
arbabnazar
361035c098
change the help text
2015-10-20 14:51:18 -04:00
Christine Lytwynec
b887280a96
update testing.rst
2015-10-20 14:24:51 -04:00
arbabnazar
c4dc624c7f
take the list of users for enrolment change
2015-10-20 14:00:59 -04:00
Jesse Zoldak
6263356035
Merge pull request #10225 from edx/zoldak/improve-learner-profile-test-code
...
Improve acceptance test code for visiting the learner profile page
2015-10-20 13:48:48 -04:00
J. Cliff Dyer
257dcc54f2
Accept raw image data as Content-type: image/*
...
MA-1416
Created a TypedFileUploadParser that validates the mimetype and then
takes the content and puts it on request.FILES['file']. Subclasses the
existing FileUploadParser.
Use namedtuple in IMAGE_TYPES as per style guide:
https://github.com/edx/edx-platform/wiki/Python-Guidelines#classes-vs-dictionaries
2015-10-20 13:23:28 -04:00
Tasawer
d2535bd02e
New Model added for Configuration of ICRV status emails.
...
ECOM-2552
2015-10-20 15:39:16 +00:00
Zubair Afzal
7fe813e6a5
Merge pull request #10217 from edx/zub/update-icrv-version-to-0.0.2
...
update ICRV block version to 0.0.4
2015-10-20 19:36:42 +05:00
Afeef Janjua
f1ee8d69df
Merge pull request #10123 from edx/afeef/bugfix/tnl-3505-country-embargo-end-run
...
TNL-3505 Country embargo end run. Invalidate cache when user changes country
2015-10-20 19:26:57 +05:00
Matt Drayer
92a845e1de
Merge pull request #10265 from edx/saleem-latif/SOL-1314
...
SOL-1314: Add Cert link to Support dashboard
2015-10-20 10:24:39 -04:00
tasawernawaz
022a873661
Merge pull request #10263 from edx/tasawer/story/ecom-2554-credit-link-escaping-html
...
Remove escaping html from dashboard link
2015-10-20 18:53:04 +05:00
Afeef Janjua
713689dffe
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 (+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
2015-10-20 18:32:21 +05:00
Saleem Latif
aaf13b9724
added certificate web view link to Support Dashboard
2015-10-20 17:44:44 +05:00
Tasawer
cc6b498228
remove escaping html for dashboard link
...
ECOM-2554
2015-10-20 13:16:18 +05:00
Matt Drayer
ad889344b1
Merge pull request #10249 from edx/update-milestones-app-hash
...
updated edx-milestones hash
2015-10-19 22:39:42 -04:00
Zia Fazal
e500963c6a
ziafazal/updated-edx-milestones-hash: Bump to v0.1.3
...
* mattdrayer: Changed github.txt reference to use release tag
* mattdrayer: Updated to edx-milestones v0.1.3 (find_packages)
2015-10-19 21:18:20 -04:00
Sarina Canelake
5095957359
Merge pull request #10256 from mitocw/gdm_pylint_ccx_2
...
Fixed new pylint violations in lms/djangoapps/ccx
2015-10-19 16:29:34 -04:00
Giovanni Di Milia
82a41b3846
Fixed new pylint violations in lms/djangoapps/ccx
2015-10-19 14:05:13 -04:00
Sarina Canelake
8970eae710
Merge pull request #10182 from open-craft/logistration-translations
...
Translate education/gender options in registration form LOC-73
2015-10-19 13:57:21 -04:00
Sarina Canelake
7b71f95f44
Merge pull request #10007 from open-craft/unenroll-course-name
...
Display course name in course unenroll confirmation popup.
2015-10-19 13:24:55 -04:00
Adam
ab78069a33
Merge pull request #10246 from edx/merge-release-into-master
...
Merge release into master
2015-10-19 11:13:49 -05:00
Ned Batchelder
8f142339de
Merge pull request #10191 from IONISx/tusbar/fix-shopping-cart-default-dates
...
TNL-3611: Remove shoppingcart default date values
2015-10-19 11:32:29 -04:00
Bertrand Marron
889f068663
Merge pull request #27 from edx/ned/add-migration-to-pr-10191
...
Add needed migration
2015-10-19 17:29:52 +02:00
Ned Batchelder
8fcb048b96
Add needed migration for datetime default change
2015-10-19 11:25:33 -04:00
Matt Drayer
f55542c5c4
Merge pull request #10156 from edx/mattdrayer/increment-edx-lint
...
mattdrayer/increment-edx-lint: Bump to v0.2.9
2015-10-19 10:57:30 -04:00
Matt Drayer
a4cc266c96
Merge pull request #10126 from edx/asadiqbal08/SOL-1288
...
asadiqbal08/SOL-1288 Add view of Certs generated to the Instructor Dashboard
2015-10-19 10:24:07 -04:00
Matjaz Gregoric
58e92b52ef
LOC-73: Translate education/gender options in registration form.
...
The education level and gender choices weren't being translated for
display on the combined login/registration form.
2015-10-19 16:21:30 +02:00
Matt Drayer
1eab25f292
mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations
...
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
2015-10-19 10:11:59 -04:00
Matt Drayer
d7c8cb803a
Merge pull request #10238 from edx/saleem-latif/SOL-1297-feedback-changes
...
SOL-1297: Remove platform name from error message in Certificates Web View
2015-10-19 09:53:42 -04:00
Matt Drayer
c30960cc85
Merge pull request #10215 from edx/ziafazal/SOL-1317
...
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
2015-10-19 09:47:20 -04:00
Matt Drayer
b4ff9f882b
Merge pull request #10146 from edx/saleem-latif/SOL-1257
...
saleem-latif/SOL-1257: Resetting student history for Entrance Exam on instructor dashboard
2015-10-19 09:45:20 -04:00
Adam Palay
9b3841f62c
Merge remote-tracking branch 'origin/release' into merge-release-into-master
...
Conflicts:
lms/djangoapps/teams/views.py
lms/templates/courseware/progress.html
2015-10-19 08:35:33 -05:00
Christina Roberts
aed32a09fc
Merge pull request #10237 from stvstnfrd/noop-tests
...
Remove unused specs
2015-10-19 09:33:42 -04:00
asadiqbal
74b082497f
SOL-1288
2015-10-19 17:28:10 +05:00
zubair-arbi
e0678c606a
update ICRV block version to 0.0.4
2015-10-19 14:50:25 +05:00
Matjaz Gregoric
9027474659
Use %()s style variable placeholder for cert name.
...
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.
2015-10-19 11:20:35 +02:00
Matjaz Gregoric
5acd203d63
Display course name in unenroll popup.
...
Only the course number was displayed in the course unenrollment
confirmation popup dialog.
Include full course display name to make it more user friendly.
2015-10-19 11:20:35 +02:00
Saleem Latif
12b245a386
Remove milestones when instructor clears a student's entry exam data
2015-10-19 12:39:22 +05:00
Saleem Latif
3502738bac
feedback changes
2015-10-19 11:10:21 +05:00
stv
ca99606f9f
Remove unused specs
...
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
4740965413
2015-10-18 04:39:25 -04:00
Christina Roberts
300bd43172
Merge pull request #9845 from edx/christina/bio-hyperlink
...
Make HTML for non-editable views on leaner profile page more logical
2015-10-16 19:03:47 -04:00
Frances Botsford
113cab87b8
profile page style cleanup
...
remove link style, add pointer, adjust spacing on profile
2015-10-16 16:35:47 -04:00
Adam
3a61cca7e6
Merge pull request #10195 from edx/hotfix/2015-10-15
...
Hotfix/2015 10 15
2015-10-16 16:25:39 -04:00
