Matt Drayer
5ed97e90f3
Merge pull request #10248 from edx/ziafazal/SOL-1319
...
SOL-1319: removed entrance exam dependency on ENABLE_MKTG_SITE
2015-10-21 10:16:56 -04:00
Christina Roberts
125930cf59
Merge pull request #10223 from edx/christina/upgrade-mathjax
...
Upgrade to MathJax 2.5.
2015-10-21 09:44:44 -04:00
Ned Batchelder
a0c25f88c3
Merge pull request #10279 from edx/ned/cleaner-django-meta
...
No need for docstrings on "class Meta"
2015-10-21 09:35:40 -04:00
Renzo Lucioni
99e6cab282
Merge pull request #10253 from edx/renzo/studio-entity-plugins
...
Groundwork for Studio extensibility
2015-10-21 09:19:17 -04:00
Jesse Zoldak
2e6880f69e
Merge pull request #10228 from edx/zoldak/fix-acceptance-select-helpers
...
Fix the helpers for Select objects by wrapping them in promises
2015-10-21 09:14:46 -04:00
wajeeha-khalid
107c49599f
Merge pull request #10008 from edx/jia/MA-1281
...
MA-1281 User Account: added account_privacy field in GET and PATCH endpoints
2015-10-21 17:52:59 +05:00
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
Ned Batchelder
322ca34b20
Remove pylint pragmas from "class Meta"
...
Also remove useless docstrings where they were added to keep pylint
quiet.
2015-10-21 07:37:00 -04:00
Ned Batchelder
1775076500
Update edx-lint to get updated pylintrc for Meta
...
It's silly to have to shut up pylint for "class Meta" all the time.
2015-10-21 07:34:15 -04:00
Zia Fazal
80abf159ee
removed entrance exam dependency on ENABLE_MKTG_SITE
...
changes after feedback from Matt D
set default value of entrance_exams feature flags to false
2015-10-21 15:21:26 +05:00
wajeeha-khalid
017477a8d7
MA-1281 User Account: added account_privacy field in GET and PATCH
2015-10-21 11:33:38 +05: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
Renzo Lucioni
32460a990e
Groundwork for Studio extensibility
...
Implement a Studio tab plugin manager, define a namespace for Studio tab plugins, and introduce an abstract base class used to represent Studio tabs. This does not introduce changes required to inject such plugins into the Studio UI. ECOM-2187.
2015-10-20 14:57:33 -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
cahrens
fbaa4e5e63
Wait for MathJax to render.
2015-10-20 11:54:10 -04:00
cahrens
5a043e5a12
Ignore line length.
2015-10-20 11:54:09 -04:00
cahrens
90b61f8ef8
Upgrade to MathJax 2.5.
...
TNL-3495
2015-10-20 11:54:09 -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
