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

42011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edx-pipeline-bot
f625e032dd Merge pull request #15659 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-25 14:54:43 -04:00
Feanil Patel
a934e9e443 Merge branch 'master' into release-mergeback-to-master 2017-07-25 14:00:33 -04:00
Eric Fischer
0f2279d325 Merge pull request #15658 from edx/efischer/fix_leaks 
CMS memory leak fix
 2017-07-25 13:26:55 -04:00
Kevin Falcone
228356dc09 Merge pull request #15633 from edx/jibsheet/remove-pre-insights-analytics-config 
Remove these unused config settings
 2017-07-25 13:07:17 -04:00
Feanil Patel
2f6fef589a Merge pull request #15649 from edx/release-candidate 
Release candidate
 2017-07-25 12:57:31 -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
Toby Lawrence
62094215fd Merge pull request #15653 from edx/tobz/DE-209 
[DE-209] Switch to the PyPI-based version of eventtracking.
 2017-07-25 11:37:31 -04:00
Afzal Wali Naushahi
0d7305bc49 Merge pull request #15636 from edx/clintonb/multi-tenant-programs-fix 
Resolved multi-tenant program issues
 2017-07-25 20:28:35 +05:00
edx-pipeline-bot
acad210d47 Merge pull request #15651 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-25 10:45:11 -04:00
Matthew Piatetsky
5c47632154 Merge pull request #15656 from edx/LEARNER-1726 
LEARNER-1726 CSS/JS fixes to Track Selection V3 Test
 2017-07-25 10:44:22 -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
Matthew Piatetsky
bfa8f4f436 CSS/JS fixes to Track Selection V3 Test 
LEARNER-1726
 2017-07-25 09:48:46 -04:00
Toby Lawrence
81354a0238 [DE-209] Switch to the PyPI-based version of eventtracking. 2017-07-24 20:05:34 -04:00
Harry Rein
fd22467261 Merge pull request #15637 from edx/HarryRein/LEARNER-1652-cleanup 
Updating jasmine tests for course tools.
 2017-07-24 16:26:24 -04: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
Diana Huang
eb987ed680 Merge pull request #15594 from edx/diana/access-checks 
Move prereq checking into course load checks.
 2017-07-24 16:04:05 -04:00
Andy Armstrong
d5fca9ee19 Merge pull request #15642 from edx/andya/studio-bootstrap-theme 
Add basic Bootstrap theme to Studio
 2017-07-24 15:25:04 -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
Christina Roberts
081231a79b Merge pull request #15647 from edx/christina/ed-947 
Don't add groups in experiment configurations twice.
 2017-07-24 14:34:08 -04:00
Feanil Patel
0356845c57 Merge pull request #15650 from edx/rc-2017-07-24 
Rc 2017 07 24
 2017-07-24 14:27:34 -04:00
Harry Rein
7efd5f38d4 Updating jasmine tests for course tools. 
LEARNER-1652

Converting test to testing all three Logging events and removing page from the logging object that is submitted.
 2017-07-24 14:21:32 -04:00
Feanil Patel
3fd17d3d21 Merge branch 'release' into rc-2017-07-24 
They both contain the same change but as different commits for bumping
the requirements for edx-ora and edx-submissions.
 2017-07-24 13:33:25 -04:00
Feanil Patel
abc1aff401 Merge branch 'release' into release-candidate 
They both contain the same change but as different commits for bumping
the requirements for edx-ora and edx-submissions.
 2017-07-24 13:20:07 -04:00
John Eskew
fc11bdd72d Merge pull request #15604 from edx/jeskew/use_django111_compat_drf_oauth 
Shift to edx fork of drf-oauth module.
 2017-07-24 12:37:03 -04:00
Diana Huang
c338b751f2 Consolidate access checks for prereqs and surveys. 2017-07-24 11:42:39 -04:00
cahrens
83ae677b83 Don't add groups in experiment configurations twice. 
EDUCATOR-947
 2017-07-24 11:03:31 -04:00
Andy Armstrong
95e47ddb02 Add basic Bootstrap theme to Studio 
LEARNER-1982
 2017-07-24 10:43:18 -04:00
Michael Frey
27cd3d199d Merge pull request #15645 from edx/mjfrey/vscode-gitignore 
Ignore Visual Studio Code directory.
 2017-07-24 09:23:08 -04:00
Michael Frey
0082f36002 Ignore Visual Studio Code directory. 2017-07-24 09:20:05 -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
John Eskew
4697aab443 Merge pull request #15634 from edx/jeskew/bump_submissions_version_for_logging 
Bump edx-submissions to v2.0.5 for better logging.
 2017-07-22 11:55:46 -04:00
John Eskew
6f79800d38 Merge pull request #15640 from ubc/ubcpi-0.6.3 
Update UBCPI to 0.6.3
 2017-07-22 11:48:56 -04:00
Pan Luo
4cc91daab4 Update UBCPI to 0.6.3 2017-07-21 16:26:42 -07:00
Jesse Shapiro
fa9c09f9fe Remove Enterprise SSO hooks 2017-07-21 18:24:09 -04:00
Kevin Falcone
585d85ea96 ANALYTICS_API_KEY and ANALYTICS_SERVER_URL aren't used 
ANALYTICS_API_KEY was used to make direct requests to the
ANALYTICS_SERVER_URL which was our original original analytics effort.
 2017-07-21 17:06:05 -04:00
Matthew Piatetsky
7452456986 Merge pull request #15616 from edx/LEARNER-1726 
LEARNER-1726 Track Selection V3
 2017-07-21 14:46:31 -04:00
John Eskew
3b523bee1b Bump edx-ora2 to v1.4.8 2017-07-21 14:29:23 -04:00
John Eskew
a8f032af8a Bump edx-ora2 to v1.4.8 2017-07-21 14:24:15 -04:00
John Eskew
3d3824d7b3 Bump edx-submissions to v2.0.5 for better logging. 2017-07-21 14:06:17 -04:00
sanfordstudent
7d9cc90cab Merge pull request #15627 from edx/sstudent/compute_grades_fix 
force subsection grades to update when course grade updates
 2017-07-21 14:03:52 -04:00
John Eskew
ca900b65fd Bump edx-submissions to v2.0.5 for better logging. 2017-07-21 13:34:36 -04:00
Matthew Piatetsky
c8250fd573 Implement track selection v3 test 
LEARNER-1726
 2017-07-21 13:17:24 -04:00
Sanford Student
66fdd2fbd3 EDUCATOR-915: force subsection grades to update when course grade updates 2017-07-21 13:07:21 -04:00
Kevin Falcone
deaf89b709 Remove these unused config settings 
We cleaned out the feature flag and code using these in
https://github.com/edx/edx-platform/pull/5707
but missed the config (I'll go get them in configuration.git later,
when I pull them out of the secure repos, which is where I found them).
 2017-07-21 12:46:11 -04:00
Afzal Wali Naushahi
17d5386046 Merge pull request #15632 from edx/afzaledx/clear_cached_programs 
Clearing the cache if the site's configuration was removed.
 2017-07-21 21:23:18 +05: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
Brittney Exline
f86f599894 Merge pull request #15631 from open-craft/bdero/bulk-enroll-content-type 
Patch the bulk_enroll request to use a form content type
 2017-07-21 09:57:22 -04:00
Afzal Wali
e82053ee43 Clearing the cache if the site's configuration was removed. 
The site's configuration does not contain the API URL, it should not keep on displayed the old cached list of uuids.
LEARNER-1146
 2017-07-21 18:25:19 +05:00