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

1554 Commits

Author SHA1 Message Date
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
384f22ff96 Add per-user metadata to course pages to make experimentation easier 2017-08-01 10:14:35 -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
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
Jeff LaJoie
8b24b29ae9 Merge pull request #15605 from edx/jlajoie/EDUCATOR-842 
EDUCATOR-842: adds in management command for verified_tracks
 2017-07-27 13:09:50 -04:00
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
666db5cc0d Fixing whitelabel messaging issue. 
WL-1147

Switching edx.org and openedx images.
 2017-07-26 17:10:07 -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
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
Jesse Shapiro
3517c1d978 Add pipeline check for linked enterprise 2017-07-26 13:51:26 -04: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
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
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
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
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
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
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
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
Brittney Exline
6439020815 ENT-550 Display only TOS for enterprise's configured to skip registration 
We have recently discovered that for any SSO Provider configured to skip
the registration form, we were auto checking the terms of service box,
which is a legal faux pas. Since IBM is planning to launch imminently and
is depending on this feature, we need to remedy this situation for enterprises
whose SSO Provider is configured to skip registration.

This PR hides all of the registration fields except TOS for this scenario
and disables the autoSubmit functionality that typically happens when skipping
registration.
 2017-07-20 12:53:20 -04:00
George Song
141c0af0eb Merge pull request #15586 from jspayd/hide-passwords-upstream 
Hide passwords in crash reports
 2017-07-20 08:59:12 -07:00
Harry Rein
f2ef2b034a Adding eventing to the course tools. 
LEARNER-1652

We now send log events when the user clicks on the events in the course
toolbar, representing a change to the new page.
 2017-07-19 13:51:23 -04:00
Awais Jibran
125552f204 Switching course view to specific student retains the profile language setting 
https://openedx.atlassian.net/browse/EDUCATOR-891
 2017-07-19 16:48:18 +05:00
Gregory Martin
7799c4adf4 Merge pull request #15592 from edx/yro-cert-pacing-signal 
Course/Certificates Pacing Signal Registration
 2017-07-18 15:36:39 -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
Gregory Martin
16945cc310 greening tests 2017-07-18 13:31:49 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory 
LEARNER-1855
 2017-07-18 12:30:12 -04:00
Gregory Martin
8b3f285d04 fix tests 2017-07-18 11:13:01 -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
Andy Armstrong
3e786ec6c5 Show page banner for anonymous and unenrolled users 
LEARNER-1697
 2017-07-17 22:19:40 -04:00
Joshua Spayd
97d5e3d8e0 Remove password hiding test code 2017-07-17 22:52:15 +00:00
Joshua Spayd
433477abe4 Hide passwords in register/login crash reports 
Includes code for testing to be removed in the next commit.
 2017-07-17 22:45:35 +00:00
Gregory Martin
e2c8fc53e8 add persistence 2017-07-17 17:57:30 -04:00
Gregory Martin
a82b73ed0c fix 2017-07-17 17:08:17 -04:00
Gregory Martin
7df91841ee cleanup 2017-07-17 15:44:29 -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
Andy Armstrong
a077a5e364 Add support for page banner status messages 
LEARNER-1890
 2017-07-17 12:17:32 -04:00
John Eskew
febf2a07ae Merge pull request #15373 from edx/jeskew/drf_upgrade_django_1.11 
Bump DRF version to 3.6.3 for eventual Django 1.11 compatibility.
 2017-07-17 11:19:56 -04:00
Robert Raposa
db16ec2a04 Merge pull request #15577 from edx/robrap/LEARNER-1896-fix-waffle-flag-cache 
Fix course override caching bug.
 2017-07-14 18:33:54 -04:00
George Song
a45ae04e8b Merge pull request #15006 from open-craft/bdero/bulk-enroll 
Upstream the Bulk Enroll API endpoint
 2017-07-14 14:20:23 -07:00