Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
c776b0d7ae Fix title to My Stats with lock. 2018-01-26 16:06:13 -05:00
Douglas Hall
96caad7f4f Merge pull request #17324 from edx/douglashall/add_enterprise_reporting_secret_to_cms 
Add ENTERPRISE_REPORTING_SECRET to cms settings.
 2018-01-26 15:59:52 -05:00
Ned Batchelder
921ea67cac Merge pull request #17312 from caesar2164/allow-theming-files-uploads-header 
Allows insertion of content above Files & Uploads
 2018-01-26 15:38:12 -05:00
Ned Batchelder
fb5f253e1c Merge pull request #17306 from caesar2164/themable-course-outline-header-extra 
Extends <head> in Studio course outline
 2018-01-26 15:37:27 -05:00
John Eskew
fa7bb1ea81 Merge pull request #17311 from mitodl/python_lib_import_fix_v2 
Enabled python code lib import with GIT_IMPORT_STATIC set to False
 2018-01-26 14:41:12 -05:00
Jae Bradley
f2a57b6956 Merge pull request #17320 from edx/robrap/LEARNER-3377-dump-assignments 
LEARNER-3377: Drop due date section of Learner Analytics and fix grading section.
 2018-01-26 14:34:30 -05:00
Douglas Hall
2775b9c382 Add ENTERPRISE_REPORTING_SECRET to cms settings. 
This is required due to the way we run migrations, starting with cms.
 2018-01-26 14:29:11 -05:00
John Eskew
5a71fa1e33 Allow inactive users to authenticate in Django 1.10+ 2018-01-26 14:04:19 -05:00
Ayub khan
bc497d35c0 Merge pull request #17318 from edx/update-translations-26-jan 
updated translations
 2018-01-26 23:53:34 +05:00
Robert Raposa
59336cc58a Drop due date section of Learner Analytics and fix grading section. 2018-01-26 13:03:50 -05:00
Jesse Zoldak
2f9a0cad60 Merge pull request #17313 from edx/testeng/bokchoy_auto_cache_update_47a2eb9be1caf40fbe0262b0cca3ae0990fa1ddd 
Bokchoy db cache update
 2018-01-26 12:48:37 -05:00
Jeremy Bowman
06c4af9bd7 Merge pull request #17315 from edx/jmbowman/PLAT-1834 
PLAT-1834 Support running a11y tests in tox
 2018-01-26 12:40:51 -05:00
Calen Pennington
e15429628f Merge pull request #16797 from cpennington/cale/fix-asset-test-ordering 
Remove order dependencies in test_assets.py
 2018-01-26 10:19:24 -05:00
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