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

43164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff LaJoie
55649355d3 EDUCATOR-842: adds in management command to swap a course's xblocks from verified track cohorts to enrollment tracks 2017-07-27 11:20:04 -04:00
David Ormsbee
39a7c09512 Re-add to BlockStructure cache on miss. 
BlockStructures are stored in S3, but they're cached in memcached. Prior
to this commit, they were only written to memcached when first created.
This commit adds a write to repopulate the cache entry every time there
is a cache miss. Hopefully, this will help reduce the miss rate we're
seeing.
 2017-07-27 11:13:00 -04:00
Matt Tuchfarber
2d0fc91136 Merge pull request #15668 from edx/tuchfarber/WL-1140 
Make HTTP 500 error pages site-aware
 2017-07-27 10:13:35 -04:00
George Song
5fca0521b2 Merge pull request #15538 from potsui/fix-duplicate-account-crash 
Catch exception with duplicate username/email
 2017-07-27 06:26:18 -07:00
Harry Rein
ce47444472 Merge pull request #15677 from edx/HarryRein/WL-1147-image-swap 
Fixing whitelabel messaging issue.
 2017-07-27 09:21:35 -04:00
Douglas Hall
6e94e371c1 Upgrade edx-enterprise package to 0.39.1. 2017-07-27 07:52:18 -04:00
Joshua Spayd
bdeb2e865a Remove unnecessary "// Overrides" comments 2017-07-26 22:13:50 +00:00
Harry Rein
666db5cc0d Fixing whitelabel messaging issue. 
WL-1147

Switching edx.org and openedx images.
 2017-07-26 17:10:07 -04:00
Diana Huang
069a905145 Merge pull request #15671 from edx/diana/tabs-issues 
Handle tab hiding at a different level.
 2017-07-26 16:57:15 -04:00
Joshua Spayd
dc22ec5018 Make timer toggle accessible 2017-07-26 20:56:16 +00:00
Alex Dusenbery
91ad611f2e EDUCATOR-783 | Upgrade to edxval 0.1.0 (supports django 1.11). 2017-07-26 16:53:40 -04:00
Matt Tuchfarber
827c703d16 Change templates to use site aware email 
Template were using global TECH_SUPPORT_EMAIL for error pages. This
changes them to use the site email if there is one.
 2017-07-26 16:45:12 -04:00
Eric Fischer
562322d71e Merge pull request #15673 from edx/efischer/actually_limit_libraries 
Return no libraries if org not specified
 2017-07-26 16:29:44 -04:00
Diana Huang
482b63baaf Handle tab hiding at a different level. 2017-07-26 16:05:48 -04:00
Tyler Hallada
cf39bef74f GradesService: accept both string id or opaque key 2017-07-26 15:49:26 -04:00
John Eskew
262e068d29 Remove development.txt from circle.yml 2017-07-26 15:41:41 -04:00
John Eskew
d483fe1b68 Mirror the devstack prereqs in CircleCI and paver install_prereqs 2017-07-26 15:40:12 -04:00
Brian Beggs
bfb17a7673 Merge pull request #15665 from edx/bmedx/django_1.11_upgrade_oauth_toolkit_PLAT-1655 
Upgrade django-oauth-toolkit to 0.12.0
 2017-07-26 15:20:09 -04:00
Jeremy Bowman
70c0b7bd3d PLAT-1590 Fixes for Docker Devstack e2e tests 2017-07-26 15:07:57 -04:00
Jesse Shapiro
90a8a17ff4 Merge pull request #15657 from open-craft/haikuginger/enterprise-from-pipeline 
[ENT-491] Check for Enterprise-linked TPA pipeline when asked for Enterprise on request
 2017-07-26 14:49:24 -04:00
Eric Fischer
2ab2ed7760 Return no libraries if org not specified 
Due to a bug in org=None vs org='', all libraries were being returned
from the "optimization" in #15292. This fix returns no libraries on the
default '' value.
 2017-07-26 14:47:37 -04:00
Jesse Shapiro
3517c1d978 Add pipeline check for linked enterprise 2017-07-26 13:51:26 -04:00
Matthew Piatetsky
5fea8b8b66 Merge pull request #15664 from edx/LEARNER-2016 
LEARNER-2016 Cannot Track Campaigns to Checkout Page Using UTM Codes
 2017-07-26 13:49:35 -04:00
Ari Rizzitano
82bc92b4d8 Merge pull request #15607 from edx/ari/webpack-commons-all-pages 
include webpack commons bundle on all pages
 2017-07-26 13:04:16 -04:00
Tasawer Nawaz
918ca9b5ac Merge pull request #15654 from edx/tasawer/learner-741/fix-user-drowndown-alignment 
Fixed user dropdown alignment
 2017-07-26 21:27:10 +05:00
hamzamunir7300
ef9935d2af Merge pull request #15591 from edx/Learner-1254 
Background color changed for microsoft button in social auth login
 2017-07-26 20:42:21 +05:00
Ari Rizzitano
3d4b2a7382 include webpack commons bundle on all pages; stub webpack_loader in python unittests 
include webpack commons bundle on all pages

quotes

homegrown webpack_loader mock

toggle installed webpack_loader in test env file instead

fix test checking context
 2017-07-26 11:28:30 -04:00
Simon Chen
9b15f58037 Merge pull request #15661 from edx/schen/learner-1521 
Move the user_attribute creation for site
 2017-07-26 10:47:38 -04:00
Hamza Munir
3f9f078189 fix for the quality tests failing 2017-07-26 19:43:37 +05:00
Afzal Wali Naushahi
c96c1c8e94 Merge pull request #15667 from edx/afzaledx/get_programs_with_type_fix 
Added a missing parameter.
 2017-07-26 17:02:33 +05:00
Afzal Wali
ec1473f84f Added a missing parameter. 2017-07-26 15:46:49 +05:00
tasawernawaz
840a919a9c Fixed user dropdown alignment 
LEARNER-741
 2017-07-26 15:34:37 +05:00
Jillian Vogel
8087a1d165 Adds settings.FEATURES.ENABLE_SEPARATE_ARCHIVED_COURSES 
Separates archived courses into a different tab on the Studio index page.

Data is rendered synchronously, but tests are added to ensure that no new sql
or mongo queries were required.
 2017-07-26 14:44:08 +09:30
Brandon Baker
53d9f87df3 Merge pull request #15662 from edx/bbaker/EDUCATOR-760 
EDUCATOR-760
 2017-07-25 16:40:11 -04:00
Matthew Piatetsky
7be1f310db Add utm params to url redirect 
LEARNER-2016
 2017-07-25 16:33:34 -04:00
bbaker6225
8e06cdbf5e EDUCATOR-760 
Change partitions logic to include partitions with one deleted group
 2017-07-25 15:06:54 -04:00
Tyler Hallada
39a27ac793 Merge remote-tracking branch 'origin/master' into EDUCATOR-926 2017-07-25 15:05:36 -04:00
bmedx
881acecc8f Upgrade django-oauth-toolkit to 0.12.0 2017-07-25 14:55:08 -04:00
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
Simon Chen
20a16f24b5 Move the user_attribute creation for site from within the user creation transaction to outside 
learner-1521
 2017-07-25 13:27:57 -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
Tyler Hallada
e619406526 Temporarily install edx-proctoring@EDUCATOR-927 2017-07-25 13:18:34 -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
Tyler Hallada
4c353d9318 Create GradesService to override persistent grades 2017-07-25 11:58:08 -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