Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,874 Commits 1 Branch 0 Tags
1eba22ae2c3093e53ca6989fb2da0c9ed44a0c87
Commit Graph

44874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stu Young
1eba22ae2c Merge pull request #17337 from edx/testeng/bokchoy_auto_cache_update_3e1fc980cce59926b066a88609db6c65f2b1540f 
Bokchoy db cache update
 2018-01-29 11:59:30 -05:00
Robert Raposa
95057afd04 Merge pull request #17336 from edx/robrap/lower-thresholds 
Lowering xss thresholds
 2018-01-29 11:40:51 -05:00
edx-cache-uploader-bot
8b420c1221 Updating migrations 2018-01-29 10:56:36 -05:00
M. Rehan
3f3a3cfd2f Merge pull request #17296 from edx/mrehan/video-foreign-key 
Bump edxval@0.1.8
 2018-01-29 20:30:07 +05:00
Robert Raposa
3bb6352bc2 Lowering xss thresholds 2018-01-29 10:20:33 -05:00
Michael Frey
5d5ce69d32 Merge pull request #16640 from open-craft/clemente/responsive-about-page 
Make the "about course" page adapt to small screens
 2018-01-29 09:24:48 -05:00
Qubad786
287f4836af update val version and clean external video export tests 2018-01-29 19:05:55 +05:00
Ayub khan
25576051df Merge pull request #17335 from edx/update-translations-29-jan 
updated-translations-29-jan
 2018-01-29 16:44:55 +05:00
Saleem Latif
40903e7868 Merge pull request #17334 from edx/saleem-latif/ENT-869 
ENT-869: Login page does not render correctly when using enterprise-related coupon URL
 2018-01-29 15:36:11 +05:00
ayub-khan
08863b3930 updated-translations-29-jan 2018-01-29 14:51:52 +05:00
Saleem Latif
534a5a7e97 Set default value of pipeline_user_details to empty dict instead of None. 2018-01-29 13:50:54 +05:00
Robert Raposa
6a92b664d1 Merge pull request #17327 from edx/robrap/LEARNER-3377-discussion-bar 
LEARNER-3377: Add tiny bar for 0 posts in My Stats.
 2018-01-27 10:26:58 -05:00
Robert Raposa
35afe06da9 Add tiny bar for 0 posts in My Stats. 2018-01-27 00:19:20 -05:00
Robert Raposa
a3ae0eb0f1 Merge pull request #17326 from edx/robrap/LEARNER-3377-fix-title 
Fix title to My Stats with lock.
 2018-01-26 18:08:49 -05:00
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
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
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
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
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