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

42048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Armstrong
0f808cec78 Implement theme admin UI to support previewing 
LEARNER-2017
 2017-07-27 17:24:31 -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
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
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
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
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
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
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
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