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

44917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Albert St. Aubin
7f6b2d6ac5 Updates the Branch IO Mobile App banner to not show in the web app 2018-01-30 13:35:12 -05:00
Albert (AJ) St. Aubin
b63b7ed8db Merge pull request #17347 from edx/revert-17308-aj/LEARNER-3800 
Revert "Aj/learner 3800"
 2018-01-30 09:45:18 -05:00
Albert (AJ) St. Aubin
01553ff1bc Revert "Aj/learner 3800" 2018-01-30 09:45:05 -05:00
Asad Iqbal
6fbd8f2453 Merge pull request #17279 from edx/asadiqbal08/ENT-398 
Delete SAML Provider Configurations (Soft Delete)
 2018-01-30 18:17:03 +05:00
Albert (AJ) St. Aubin
b41019f304 Merge pull request #17308 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-30 07:42:05 -05:00
Uzair Rasheed
cebbc7d620 Merge pull request #17142 from edx/LEARNER-3529/manage_user 
Add Manage User Feature to Support Tool
 2018-01-30 15:06:13 +05:00
uzairr
266c8fe737 Add Manage User Feature to Support Tool 
Support Team receive much requests from the users to disable their
accounts on edX.To fullfill their requests, Support has to contact
DevOps.To avoid it, a new feature is added which can easily disable
the user account.

LEARNER-3529
 2018-01-30 12:16:44 +05:00
Sofiya Semenova
72d300b822 Merge pull request #17290 from edx/sofiya/ed-2149 
Test that video completion data is only being sent after a video has been watched, and not on page load
 2018-01-29 17:24:53 -05:00
Jeremy Bowman
f24c654262 Merge pull request #17323 from edx/jmbowman/PLAT-1350 
PLAT-1350 Log Python warnings in production
 2018-01-29 16:55:54 -05:00
Ned Batchelder
630766b163 Merge pull request #16571 from open-craft/cornwell/ie11-cohorts 
Fixes Discussion Posts Not Showing in IE11 Browsers
 2018-01-29 16:48:37 -05:00
Douglas Hall
3e3b5dda3e Merge pull request #17340 from edx/douglashall/ENT-854_part2 
ENT-854 Remove references to old EnterpriseCustomerReportingConfiguration model fields.
 2018-01-29 16:43:05 -05:00
Sofiya Semenova
078ed719a0 Test that video is only completed upon being watched 2018-01-29 15:52:22 -05:00
Jeremy Bowman
5ca1a51460 PLAT-1350 Log Python warnings in production 2018-01-29 15:50:13 -05:00
Douglas Hall
538b073ee4 ENT-854 Remove references to old EnterpriseCustomerReportingConfiguration model fields. 2018-01-29 15:43:28 -05:00
David Ormsbee
b0f67c975d Merge pull request #16322 from mitodl/capa_show_answer_fix 
Fix for courses which have url_names with colons, e.g. problem:question1
 2018-01-29 15:07:16 -05:00
John Eskew
1eb8b3a9a0 Merge pull request #17147 from open-craft/clemente/add-forum-to-heartbeat 
Allow to include forum status in LMS heartbeat service.
 2018-01-29 14:27:38 -05:00
Troy Sankey
381af53ad5 Merge pull request #17130 from edx/jeskew/fix_lms_shard_4_tests_django_111 
LMS shard 4 tests Django 1.11
 2018-01-29 14:14:22 -05:00
Albert St. Aubin
90d29550bb test fix 2018-01-29 13:06:17 -05:00
Amir Qayyum Khan
3bda024a66 Fixed for courses which have url_names with colons, e.g. problem:question1 
What's this PR do?
It fixes display.js to escape colons in element ID's so they can be selected with jquery,
Previously jquery was throwing errors about unsupported pseudos, e.g.:

unrecognized expression: unsupported pseudo: pset1_1_2_1
How should this be manually tested?
create a course with column (:) in its problem id, and see console for any issue

Added tests
 2018-01-29 22:38:04 +05:00
Albert St. Aubin
12e77b27e4 PR updates 2018-01-29 12:22:56 -05:00
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
Albert St. Aubin
3876a823f8 pr 2018-01-29 11:15:33 -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
Albert St. Aubin
1bd4bde9a4 PR and quality updates 2018-01-29 09:07:29 -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
Daniel Clemente Laboreo
ce461b1d6e Include forum status in LMS heartbeat service. 2018-01-29 08:53:36 +02: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
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