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

44942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Roytman
60bc10e7ea Merge pull request #17357 from edx/mroytman/bump-studio-frontend 
bump version of studio-frontend
 2018-01-31 10:18:26 -05:00
Uzair Rasheed
9aff0ba9a0 Merge pull request #17344 from edx/LEARNER-3465/catch-sailthru-connection-error 
Handle Exception in getting cookies from Sailthru
 2018-01-31 20:05:04 +05:00
Bill DeRusha
fd8cd2ffbe Merge pull request #17348 from proversity-org/proversity/edx-pr-fix-layout-in-learner-profile 
Fix layout in learner profile
 2018-01-31 09:21:06 -05:00
Robert Raposa
093fefaf74 Merge pull request #17360 from edx/robrap/fix-la-waffle 
Add new waffle for modals.
 2018-01-31 09:05:21 -05:00
uzairr
4e91ce19b1 Handle Exception in getting cookies from Sailthru 
In order to send email, cookies are required from Sailthru,
ocassionally, celery task fails possibly because of request timeout
that ultimately fails login.To avoid it,generic exception handler
is added so that login will not fail in future.

LEARNER-3465
 2018-01-31 18:35:19 +05:00
Albert (AJ) St. Aubin
55c6387db6 Merge pull request #17349 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-31 07:03:34 -05:00
Albert (AJ) St. Aubin
71991887dd Merge pull request #17353 from edx/aj/LEARNER-3186 
Updates the Branch IO Mobile App banner to not show in the web app
 2018-01-31 07:00:55 -05:00
Jeremy Bowman
0514e0a907 Merge pull request #17361 from edx/jmbowman/always_recreate_tox_env 
Always use a fresh tox env in Jenkins
 2018-01-31 00:28:07 -05:00
Jeremy Bowman
a56fd66270 Always use a fresh tox env in Jenkins 2018-01-30 18:43:43 -05:00
Michael Roytman
8fff350284 bump version of studio-frontend 2018-01-30 15:54:53 -05:00
Robert Raposa
d6c15ffdbf Add new waffle for modals. 2018-01-30 15:27:12 -05:00
Robert Raposa
8b7701df9e Merge pull request #17355 from edx/learner-analytics-handle-all-comment-client-errors 
More complete try/catch for the User Profile request in the Learner Analytics View
 2018-01-30 14:47:38 -05:00
Calen Pennington
f2c3aed8e7 Merge pull request #17316 from cpennington/switch-cms-login-to-webpack 
Migrate login.js to webpack
 2018-01-30 14:24:08 -05:00
jaebradley
070b6ce414 more complete catch 2018-01-30 13:57:54 -05:00
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
Brittney Exline
73f3a63ea2 Merge pull request #17276 from edx/bexline/configure_saml_certs 
ENT-839 Add ability to configure SP metadata for an IdP
 2018-01-30 11:18:09 -07:00
Michael Youngstrom
b16fd7047a Merge pull request #17346 from edx/testeng/bokchoy_auto_cache_update_86388d4e4fabba382afae1acb17807a4be4f5375 
Bokchoy db cache update
 2018-01-30 12:41:44 -05:00
Brittney Exline
c4670a33d7 ENT-839 Add ability to configure SP metadata for an IdP 2018-01-30 11:37:46 -05:00
Eric Fischer
18408d2f10 Merge pull request #17350 from edx/efischer/ora2_2.1.11 
edx-ora2 2.1.11
 2018-01-30 11:32:02 -05:00
Calen Pennington
b701ad77c8 Rename require_page to invoke_page_bundle 2018-01-30 10:32:31 -05:00
Calen Pennington
5772042199 Migrate login.js to webpack 2018-01-30 10:32:31 -05:00
edx-cache-uploader-bot
6284a48cd7 Updating migrations 2018-01-30 10:23:40 -05:00
Eric Fischer
f132ea405d edx-ora2 2.1.11 2018-01-30 10:15:56 -05:00
Albert St. Aubin
b0e670e0de Used the incorrect version of the Course Key when building Course 
Entitlements list
 2018-01-30 09:55:31 -05:00
Albert St. Aubin
ddab8123c1 Updates to the Course Entitlement API to block Learners from enrolling 
in runs that are not available.

[LEARNER-3800]
 2018-01-30 09:52:06 -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
Jose Antonio Gonzalez
238e2f6b47 fix layout in learner profile 2018-01-30 16:42:02 +02: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