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

16565 Commits

Author SHA1 Message Date
Sofiya Semenova
799e2bb4e4 Merge pull request #15693 from edx/ssemenova/whitespace 
Educator-986 large space in show answer view for instructors
 2017-08-01 16:44:33 -04:00
Christina Roberts
20d67a5f7f Merge pull request #15690 from edx/christina/django-wiki-upgrade 
Django-wiki upgrades.
 2017-08-01 15:37:46 -04:00
Sofiya Semenova
6fd66fdc89 Educator-986 large space in show answer view for instructors 2017-08-01 18:19:19 +00:00
cahrens
5077ab5897 Django-wiki upgrades. 
EDUCATOR-784, EDUCATOR-1065
 2017-08-01 14:10:58 -04:00
Calen Pennington
fb905e547b Merge pull request #15709 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-01 13:45:08 -04:00
sanfordstudent
903bb6ab3f Merge pull request #15682 from edx/sstudent/cms_cert_date 
add cert available date to CMS settings
 2017-08-01 13:23:32 -04:00
Sanford Student
bf7b3eab1a add cert available date to CMS settings 2017-08-01 10:44:42 -04:00
Calen Pennington
68df7b80e3 Add course_end to the list of experiment fields put in the DOM 2017-08-01 10:14:35 -04:00
Calen Pennington
1edd367008 Add course_start to the fields, and put all fields on the track selection page 2017-08-01 10:14:35 -04:00
Calen Pennington
384f22ff96 Add per-user metadata to course pages to make experimentation easier 2017-08-01 10:14:35 -04:00
Alex Dusenbery
cc6f8be8fb EDUCATOR-1029 | More defensive version of ZeroSubsectionGrade.problem_scores 2017-07-31 13:44:15 -04:00
John Eskew
19a5aa7d44 Merge pull request #15684 from edx/jeskew/enable_django_debug_toolbar 
Only display debug toolbar on non-ajax requests.
 2017-07-28 15:47:09 -04:00
Clinton Blackburn
5db02ef673 Added support for dynamic upgrade deadlines 
The verified seat upgrade deadline for self-paced course runs is now
dependent on when the learner was first able to access the content--the
latest of enrollment date and course run start date.
 2017-07-28 15:44:35 -04:00
Sofiya Semenova
366cc044be Merge pull request #15635 from edx/ssemenova/ed-699 
Educator-699 Modify deleted group warning on the unit/container page
 2017-07-28 07:23:11 -07:00
Andy Armstrong
d247fe63bb Merge pull request #15643 from edx/andya/site-theme-preview 
Implement theme admin UI to support previewing
 2017-07-27 20:33:07 -04:00
Andy Armstrong
0f808cec78 Implement theme admin UI to support previewing 
LEARNER-2017
 2017-07-27 17:24:31 -04:00
John Eskew
f1b13595c0 Only display debug toolbar on non-ajax requests. 2017-07-27 16:59:08 -04:00
Sofiya Semenova
d888498038 EDUCATOR-699 Modify deleted group warning on the unit/container page 
EDUCATOR-1001 Fix language for visibility editor and validation to include units
 2017-07-27 20:55:07 +00:00
Jeremy Bowman
c7db5d894e Merge pull request #15674 from edx/jmbowman/PLAT-1590 
PLAT-1590 Fixes for Docker Devstack e2e tests
 2017-07-27 14:40:27 -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
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
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
Diana Huang
482b63baaf Handle tab hiding at a different level. 2017-07-26 16:05:48 -04:00
Jeremy Bowman
70c0b7bd3d PLAT-1590 Fixes for Docker Devstack e2e tests 2017-07-26 15:07:57 -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
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
Matthew Piatetsky
7be1f310db Add utm params to url redirect 
LEARNER-2016
 2017-07-25 16:33:34 -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
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
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
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
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
Diana Huang
c338b751f2 Consolidate access checks for prereqs and surveys. 2017-07-24 11:42:39 -04:00
Andy Armstrong
95e47ddb02 Add basic Bootstrap theme to Studio 
LEARNER-1982
 2017-07-24 10:43:18 -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
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
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
Matthew Piatetsky
c8250fd573 Implement track selection v3 test 
LEARNER-1726
 2017-07-21 13:17:24 -04:00