Commit Graph

53520 Commits

Author SHA1 Message Date
edx-cache-uploader-bot
2b90998715 Updating migrations 2018-01-26 09:55:51 -05:00
asadiqbal
47547c0c1b Delete SAML Provider Configurations 2018-01-26 17:54:45 +05:00
M. Rehan
777eb1a3ab Merge pull request #17314 from edx/mrehan/move-request-cache-to-openedx
Move request_cache to openedx.core.djangoapps
2018-01-26 17:10:17 +05:00
Noraiz Anwar
867c2f31cc Merge pull request #17317 from edx/noraiz/EDUCATOR-2213
fix gating api exception handling
2018-01-26 16:57:18 +05:00
ayub-khan
9a50e018f0 updated translations 2018-01-26 16:38:12 +05:00
noraiz-anwar
0d40dba7ff fix gating api exception handling 2018-01-26 15:41:54 +05:00
Qubad786
64555c60c0 Move request_cache to openedx.core.djangoapps 2018-01-26 15:09:25 +05:00
Jeremy Bowman
58c765bc31 PLAT-1834 Support running a11y tests in tox 2018-01-25 18:13:14 -05:00
Douglas Hall
7a552f7446 Merge pull request #17307 from edx/douglashall/upgrade_edx_enterprise_0_63_0
Upgrade edx-enterprise package to 0.63.0.
2018-01-25 16:42:16 -05:00
Eric Fischer
e1917004cb Merge pull request #17305 from edx/efischer/ora_update
Update edx-ora2 to version 2.1.10
2018-01-25 16:16:43 -05:00
Giulio Gratta
5b0344d87f Allows insertion of content above Files & Uploads 2018-01-25 13:11:55 -08:00
Gavin Sidebottom
382b6069d8 PR feedback (added docstring notes, cleared up log messages) 2018-01-25 16:09:13 -05:00
Gavin Sidebottom
ec0263bc5b changed 'course code lib' references to 'python lib' to maintain consistency 2018-01-25 16:08:57 -05:00
Gavin Sidebottom
8476f19463 Enabled python code lib import with GIT_IMPORT_STATIC set to False 2018-01-25 16:08:25 -05:00
Albert St. Aubin
cac22680e2 Updates to the Course Entitlement API to block Learners from enrolling
in runs that are not available.

[LEARNER-3800]
2018-01-25 14:53:03 -05:00
Giulio Gratta
794630824e Extends <head> in Studio course outline
- Can add meta, link, and script tags
- Adds to rather than replaces edX tags
2018-01-25 11:28:06 -08:00
Eric Fischer
45decc48b3 Update edx-ora2 to version 2.1.10 2018-01-25 14:05:35 -05:00
Douglas Hall
a458fa9f93 Upgrade edx-enterprise package to 0.63.0. 2018-01-25 14:01:26 -05:00
Douglas Hall
5ccd465d85 Merge pull request #17304 from edx/douglashall/ENT-854
ENT-854 Add django-fernet-fields to requirements.
2018-01-25 13:56:24 -05:00
Eric Fischer
4fd60d11a0 Merge pull request #17289 from edx/efischer/discussion_profile_header
Render discussion profile page as a fragment to fix styling issues
2018-01-25 12:23:47 -05:00
Troy Sankey
e649d2d782 Shim query count assertions due to added SAVEPOINTs 2018-01-25 11:38:46 -05:00
Troy Sankey
1deb26e190 avoid unnecessary attempt to update an immutable dict
request.data has become immutable under Django 1.11 for some reason.
Regardless, setting the 'id' key should be extraneous because we already
instruct the update method to use a specific pk (see kwargs) which
should be sufficient to locate the database record and update it.
2018-01-25 11:38:46 -05:00
John Eskew
27edca3c5e Replace all clean_course_id form methods with common method. 2018-01-25 11:38:46 -05:00
John Eskew
875a127f84 Pylint fixes to move number below allowed threshold. 2018-01-25 11:38:37 -05:00
John Eskew
b1f0b7d230 Convert course id to locator differently to accomodate Django 1.11 2018-01-25 11:33:52 -05:00
Troy Sankey
6d061a16c5 Enable cache isolation for test_email tests
Cache isolation is provided by
CacheIsolationMixin/CacheIsolationTestCase, and was enabled in these
tests in order to stop the 'site' variable in the edxmako template
context from bleeding into subsequent tests via the request cache.
2018-01-25 11:33:51 -05:00
John Eskew
ff545e2a60 Handle different cookie processing for Django 1.11 2018-01-25 11:33:51 -05:00
John Eskew
56f9efcc4c Create course mode in one line without extra save. 2018-01-25 11:33:51 -05:00
John Eskew
efbde03ce0 Move param addition for POST request to creation. 2018-01-25 11:33:51 -05:00
John Eskew
c55aa9e1d5 Change POST request upon creation only. 2018-01-25 11:33:44 -05:00
John Eskew
2eab707cc0 Change str conversion to text_type. 2018-01-25 11:23:31 -05:00
John Eskew
3915c47d71 Bump query counts for grading in Django 1.11. 2018-01-25 11:23:31 -05:00
Douglas Hall
d158da2792 ENT-854 Add django-fernet-fields to requirements. 2018-01-25 11:05:18 -05:00
Eric Fischer
aa44292890 render discussion_profile_page as a fragment 2018-01-25 10:08:08 -05:00
Jeremy Bowman
7c2826b8e8 Merge pull request #17300 from edx/jmbowman/PLAT-1899
PLAT-1899 Fix some issues running under Django 1.10+
2018-01-25 09:39:26 -05:00
Jeremy Bowman
182a5bcb23 Merge pull request #17302 from edx/jmbowman/PLAT-1900
PLAT-1900 Remove dependency on abandoned django-pipeline-forgiving
2018-01-25 09:37:50 -05:00
Dennis Jen
d3d64970c3 Merge pull request #17263 from caesar2164/update-course-about-date-conditionals
Updates course about date conditionals
2018-01-25 08:23:35 -05:00
AlasdairSwan
cc7431526f Merge pull request #17301 from edx/alasdair/learner-analytics-dashboard-week-streak-tweak
Update to week streak display logic
2018-01-25 08:20:05 -05:00
Albert (AJ) St. Aubin
f07880bb38 Merge pull request #17297 from edx/aj/LEARNER-3629_refactor
Refactor of the CourseEntitlement Refund API to handle refund failures
2018-01-25 07:13:44 -05:00
adeel khan
6477482c7e Merge pull request #17069 from edx/adeel/Learner_3110_fix_invalid_certificate_page
Fix invalid certificate page for a11y and translation.
2018-01-25 11:48:33 +01:00
Adeel Khan
d9d4ae5535 Fix invalid certificate page for a11y and translation.
Invalid certificate page has hardcoded lang='en' for
html, that would cause a11y issue for other languages user.
Some of screen reader text is not under translation. This patch
would fix both issues.

LEARNER-3110
2018-01-25 14:02:12 +05:00
Calen Pennington
060b27ad18 Remove order dependencies in test_assets.py 2018-01-24 22:15:10 -05:00
John Eskew
d21a098280 Merge pull request #17146 from open-craft/clemente/move-heartbeat-settings-to-env
Allow customizing heartbeat checks
2018-01-24 20:21:51 -05:00
AlasdairSwan
6f1d41c171 Update to week streak display logic 2018-01-24 18:56:06 -05:00
Jeremy Bowman
36e321a5a2 PLAT-1900 Remove dependency on abandoned django-pipeline-forgiving package 2018-01-24 17:53:12 -05:00
sanfordstudent
fda773721c Merge pull request #17285 from edx/sstudent/hide_cert_setting
deprecate html setting for web certs and set to true by default
2018-01-24 16:27:40 -05:00
Giulio Gratta
f7795f8a68 Updates course about date conditionals
- Formatted date start strings can contain unicode, so six.string_types is a better `is_instance` check
- "end_date" is no longer a required key in the `get_course_about_section` dictionary, so that check can fail and is bad.
2018-01-24 13:11:48 -08:00
Jeremy Bowman
ff4732bcf6 PLAT-1899 Fix some issues running under Django 1.10+ 2018-01-24 16:04:28 -05:00
Sanford Student
e2becea8cb deprecate html setting for web certs and set to true by default 2018-01-24 15:02:44 -05:00
Michael Youngstrom
1a1e3b8a44 Merge pull request #17275 from edx/youngstrom/bokchoy_s3
Dont require creds to read from cache bucket
2018-01-24 14:55:42 -05:00