wajeeha-khalid
fa285e09a4
MA-1189 - Discussion API: implemented GET comment children
2015-10-22 15:53:34 +05:00
tasawernawaz
450e625d97
Merge pull request #10280 from edx/tasawer/story/ecom-2538-fix-for-multiple-providers
...
Fix parameter name issue for multiple providers
2015-10-22 09:48:22 +05:00
Renzo Lucioni
d414d74fab
Merge pull request #10260 from edx/renzo/reserve-service-user
...
Reserve ecommerce worker username
2015-10-21 16:21:53 -04:00
Renzo Lucioni
fda61b52aa
Reserve ecommerce worker username
...
Django's user model allows email addresses to be blank. However, edx-platform includes a migration requiring that email addresses be unique. Someone in our production environment already had a blank email address, so this migration was failing earlier.
2015-10-21 15:27:50 -04:00
Christina Roberts
a48d3ebe84
Merge pull request #10272 from edx/christina/PLAT-878
...
Delete dead reference to modules.css.
2015-10-21 14:26:07 -04:00
Jim Abramson
88bfeafe4c
Merge pull request #10274 from edx/jsa/update-erac
...
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
2015-10-21 14:20:53 -04:00
Christina Roberts
9295b37d28
Merge pull request #10286 from edx/christina/deprecate-survey
...
Deprecate end_of_course_survey_url until it can be removed.
2015-10-21 14:11:20 -04:00
AlasdairSwan
c622f03a6a
Merge pull request #10288 from edx/release
...
Release 2015-10-21
2015-10-21 13:16:35 -04:00
cahrens
05cae8c684
Deprecate end_of_course_survey_url until it can be removed.
2015-10-21 10:36:13 -04:00
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
AlasdairSwan
969b4995e5
Merge pull request #10254 from edx/rc/2015-10-20
...
Rc/2015 10 20
2015-10-21 10:03:27 -04:00
Tasawer
65c93d7ad5
Fix for multiple provider ids
...
ECOM-2538
2015-10-21 13:54:59 +00: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
jsa
56b7b7007e
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
2015-10-20 17:44:19 -04:00
David Ormsbee
1df0fb6355
Merge pull request #10269 from edx/ormsbee/rc-fix-courseoverview-versions
...
CourseOverview will only delete old versions of saved data.
2015-10-20 16:13:54 -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
David Ormsbee
4ac9725793
Remove foreign key constraint on CourseOverviewTab -> CourseOverview
...
This will allow v1 code of CourseOverview to delete entries. While
this is not a good thing in general (and future versions will ignore
entries with higher versions than they support), this is necessary
to prevent errors with the existing code in a rollback situation.
Otherwise, old code trying to delete CourseOverview entries will
fail with a foreign key constraint violation.
2015-10-20 15:30:31 -04:00
arbabnazar
b3e37e54ba
remove the append action
2015-10-20 15:30:06 -04:00
David Ormsbee
3cd348008d
CourseOverview will only delete old versions of saved data.
...
Previously, CourseOverview would delete data for any version
that didn't match the current one. That could cause problems
during deploys, when multiple versions of CourseOverview
were active. They would overwrite each other, and that could
cause problems if the old one overwrote the new one -- in
our case, the new one created a new table with foreign key
links that the old one was unaware of, and trying to delete
it would have caused an error.
2015-10-20 15:03:50 -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
cahrens
6d7ab6e868
Delete dead reference to modules.css.
...
PLAT-878
2015-10-20 14:26:55 -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
