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

14878 Commits

Author SHA1 Message Date
Eric Fischer
0f2279d325 Merge pull request #15658 from edx/efischer/fix_leaks 
CMS memory leak fix
 2017-07-25 13:26:55 -04:00
Eric Fischer
d4943c5337 Use bulk_operations when loading items 
This has been causing a huge memory leak, wrapping the call in this
context manager properly cleans up the 'records' entries.

EDUCATOR-274
 2017-07-25 12:40:15 -04:00
Eric Fischer
bc6d7980a4 Revert "Merge pull request #15593 from edx/efischer/edu-274_logging" 
This reverts commit 2d6b477e83, reversing
changes made to 7799c4adf4.
 2017-07-25 10:38:29 -04:00
Clinton Blackburn
9efa7770f8 Resolved multi-tenant program issues 
A site must be passed so the system knows which URL to use to contact
the Discovery Service.
 2017-07-25 19:37:14 +05:00
Harry Rein
b523ac3f91 Merge pull request #15589 from edx/HarryRein/LEARNER-1894-in-course-messaging-xsy 
Adding in-course messages on the home page.
 2017-07-24 16:06:52 -04:00
Harry Rein
08df53e110 Adding in course messaging to the home page. 
LEARNER-1894

This commit adds in course messaging for three use cases. First,
when the user is not signed in, the user is shown a message that
provides a link to sign in or register. If the user is signed in
but not enrolled, they are given a link to do so. If the user is
enrolled but the course has not yet started, they are shown a
message explaining when the course starts and shown a link (not
yet enabled) to add a reminder to their calendar.

The implementation defines a base message class and extends it
for the course home messages as well as the previously implemented
page level messages.
 2017-07-24 15:17:12 -04:00
Diana Huang
c338b751f2 Consolidate access checks for prereqs and surveys. 2017-07-24 11:42:39 -04:00
Jesse Shapiro
91752ad98a Merge pull request #15624 from open-craft/haikuginger/remove-sso-consent 
[ENT-491] Remove SSO consent features; verify fully-populated consent URL generation
 2017-07-24 07:43:16 -04:00
Jesse Shapiro
fa9c09f9fe Remove Enterprise SSO hooks 2017-07-21 18:24:09 -04:00
Ari Rizzitano
b524f0e15b Merge pull request #15610 from edx/ari/fix-webpack-failures 
catch WebpackLoaderBadStatsError in test runs
 2017-07-21 11:32:39 -04:00
Ari Rizzitano
038d5a1351 catch WebpackLoaderBadStatsError to prevent unittest concurrency errors 
[LEARNER-1938]

try also catching WebpackLoaderBadStatsError
[LEARNER-1938]

catch BaseWebpackLoaderException also

do i need to import the exception?

add better logging
 2017-07-21 10:17:55 -04:00
Ahmed Jazzar
fc5716d9b1 Fixed milestone issues 
In settings_handler and any_unfulfilled_milestones (for mobile APIs)
 2017-07-20 10:55:44 -07:00
Jeff LaJoie
aa5b8bed11 Merge pull request #15289 from edx/jlajoie/EDUCATOR-434 
EDUCATOR-434: Unit Group Access
 2017-07-19 15:32:02 -04:00
Jeff LaJoie
1c90220462 EDUCATOR-434: Extends Course Outline Unit settings to allow Group Access configuration 2017-07-19 14:17:38 -04:00
Christina Roberts
e9e72aec89 Merge pull request #15596 from edx/christina/update-organizations 
Remove flaky wiki editing test
 2017-07-19 14:02:45 -04:00
Christina Roberts
eadc099512 Merge pull request #15597 from edx/christina/revert-ed-60 
Restore more specific error messages.
 2017-07-19 11:03:38 -04:00
cahrens
67e61e878a Remove flaky editing test. 
EDUCATOR-511
 2017-07-19 10:52:33 -04:00
Marko Jevtic
2a7b41673b [LEARNER-1104] Allow staff members to view enrollment for any user 2017-07-19 12:45:24 +00:00
Eric Fischer
2d6b477e83 Merge pull request #15593 from edx/efischer/edu-274_logging 
Add ActiveBulkThread record logging; CMS memory leak debug
 2017-07-18 15:45:03 -04:00
cahrens
4e3ed8b5c6 Restore more specific error messages. 
EDUCATOR-929
 2017-07-18 15:21:00 -04:00
Jeremy Bowman
dfca1fa2fa Merge pull request #15574 from edx/jmbowman/PLAT-1619 
PLAT-1619 karma and bok-choy Docker Devstack fixes
 2017-07-18 15:04:02 -04:00
Eric Fischer
f7613819a0 Add ActiveBulkThread record logging; CMS memory leak debug 2017-07-18 14:56:53 -04:00
Eric Fischer
da931349d5 Merge pull request #15595 from edx/dahlia/EDU-949 
Skip flaky proctoring tests until we can fix them
 2017-07-18 14:39:14 -04:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Eric Fischer
03896448ce Skip flaky tests until we can fix them 2017-07-18 12:40:37 -04:00
Brittney Exline
b4c2b56109 Merge pull request #15583 from edx/bexline/revert_ent_457 
ENT-512 Revert ENT-457 to avoid production error noise
 2017-07-18 10:05:23 -04:00
Ari Rizzitano
4370142a84 Merge pull request #15581 from edx/ari/flaky-problem-type-test 
mark test_problem_type_a11y as flaky
 2017-07-17 15:01:54 -04:00
Brittney Exline
8c362d4df6 Revert "Create EnterpriseCourseEnrollment when enrolling via Track Selection page" 
This reverts commit d940bbfd09.
 2017-07-17 14:11:24 -04:00
Brittney Exline
6c761ce8aa Revert "Specify catalog URL to configure" 
This reverts commit add01fdfab.
 2017-07-17 14:11:24 -04:00
Matt Tuchfarber
4813df02a3 Fix WL sites from causing multiple zendesk emails 
WL-1109. Currently the system is using org filters to tag zendesk
tickets. MITxPro uses both MITxPro and MITProfessionalX org filters
to pull courses from both orgs. This is causing multiple emails to
be sent from Zendesk as they are getting tagged with both
whitelabel_MITProfessionalX and whitelabel_MITxPRO. This fix changes
to using SITE_NAME instead.
 2017-07-17 12:47:23 -04:00
Ari Rizzitano
a16f0b2fe0 test_problem_type_a11y is flaky 2017-07-17 11:39:27 -04:00
Jeremy Bowman
309ec0ac86 PLAT-1619 karma and bok-choy Docker Devstack fixes 2017-07-14 16:00:09 -04:00
edx-pipeline-bot
b97f593402 Merge pull request #15573 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-14 12:56:04 -04:00
muhammad-ammar
edcd64e90f edx-videoi-id strip fix 
LEARNER-1871
 2017-07-14 19:17:16 +05:00
Diana Huang
6f24c5a234 Deprecate the Course Home Sidebar setting. 2017-07-13 14:09:26 -04:00
Simon Chen
be3c29b006 Merge pull request #15550 from edx/LEARNER-683 
Allow enrollment into expired seats if the api is called by ECOM service
 2017-07-13 09:04:08 -04:00
George Song
06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject 
Use platform_name instead of site_name in password reset email
 2017-07-13 05:52:21 -07:00
Albert (AJ) St. Aubin
c78b84ca3f Merge pull request #15480 from edx/staubina/ed-592 
Staubina/ed 592
 2017-07-12 17:24:53 -04:00
Simon Chen
a3d511926f Allow enrollment into expired seats if the api is called by ecom service 2017-07-12 16:04:52 -04:00
Christina Roberts
04f9db20c0 Merge pull request #15533 from edx/christina/remove-mustache 
Remove last Mustache usage.
 2017-07-12 12:58:21 -04:00
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04:00
cahrens
bddc29a850 Remove last Mustache usage. 2017-07-12 12:08:59 -04:00
Qubad786
c9bbc0b68a Dont fetch caption on getting translations 
This fixes the endless loop of fetchCaptions ajax requests. fetchCaption on error calls fetchAvailableTranslations which again calls fetchCaption on success and so on. We don't see any significance for calling fetchCaption in fetchAvailableTranslations.
 2017-07-12 16:45:17 +05:00
Diana Huang
165c0aae85 Merge pull request #15465 from edx/andya/ccx-redirect 
Implement course home redirect if user cannot enroll
 2017-07-11 15:18:56 -04:00
Andy Armstrong
13854fb8ab Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-11 14:10:52 -04:00
Christina Roberts
b14b951122 Merge pull request #15524 from edx/christina/remove-mustache 
Remove unneeded mustache references.
 2017-07-11 13:28:06 -04:00
Kyle McCormick
fade4a10af Implement event for forum thread views 
EDUCATOR-341
 2017-07-11 12:42:49 -04:00
cahrens
21bcf02d97 Remove unneeded mustache references. 2017-07-11 12:06:27 -04:00
Andy Armstrong
a815003b3b Handle anonymous and unenrolled users on the new course home page 
LEARNER-1696
 2017-07-10 17:52:28 -04:00