Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,600 Commits 1 Branch 0 Tags
7b439d020bce152febbbc4a3be8ed48cd1b24043
Commit Graph

16353 Commits

Author SHA1 Message Date
Brian Beggs
7074e3abba Merge pull request #14902 from Salomari1987/salah/copyright-year 
Set COPYRIGHT_YEAR dynamically
 2017-06-23 16:06:35 -04:00
Brittney Exline
cc460bbb0d Merge pull request #15391 from edx/bexline/ent_authentication_flow 
ENT-447 Add ability to hide auth warnings for enterprise context.
 2017-06-23 15:55:03 -04:00
Brittney Exline
611af39d53 ENT-447 Add ability to hide auth warnings for enterprise context. 
When a user comes in through an sso provider and arrives at the login
or registration page, there is a warning message that comes up to indicate
that the user has to take an action to sign in and register and thus
link their sso account to their edx account. However, it is confusing,
particularly for the enterpise context. This diff disables these messages
from being rendered if these pages are being shown in an enterprise context.
 2017-06-23 14:03:53 -04:00
Harry Rein
aea407b13e Merge pull request #15355 from edx/HarryRein/LEARNER-1485-course-reviews-tool 
LEARNER-1485: Adding a reviews page and link from the course tool bar
 2017-06-23 13:09:13 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02:00
Harry Rein
82daaa5ad3 Adding a reviews page to the course and updating the reviews module on the course about page. Removed the existing coursetalk implementation and put it in a fragment, removed the tests as well. Added configuration settings to specify the reviews template as well as the reviews provider. This is all protected by a waffle flag. 2017-06-23 11:27:48 -04:00
Marko Jevtic
d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo 
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
 2017-06-23 16:27:37 +02:00
Diana Huang
3d09290c14 Add a dismiss button to welcome message. 
Store user's preference indefinitely.
 2017-06-22 18:26:50 -04:00
Matthew Piatetsky
72fb972288 Merge pull request #15358 from edx/LEARNER-1312b 
LEARNER-1312 Track Selection Choice (v2)
 2017-06-22 17:17:20 -04:00
Matthew Piatetsky
5c7e67e919 Create test for new version of track selection page 
LEARNER-1312
 2017-06-22 16:28:00 -04:00
Jeremy Bowman
5a6b8cd35b PLAT-1228 Support bok-choy in Docker Devstack 2017-06-22 15:03:12 -04:00
Ned Batchelder
8dab37122c Update translations (autogenerated message) 2017-06-21 14:36:35 +00:00
Clinton Blackburn
dd1f834697 Displaying verification denial reasons on dashboard 
Learners now see (on the dashboard) a list of reasons why their verifications were denied.

LEARNER-1486
 2017-06-20 17:44:13 -04:00
Jesse Shapiro
f5769959dd Merge pull request #15135 from open-craft/uman/OC-2606 
[ENT-365] Move from python-social-auth to split social
 2017-06-20 17:04:20 -04:00
Alex Dusenbery
eb73057d90 EDUCATOR-333: Grade each course subsection exactly once; ensure that our stashed, unsaved subsection grades are unique. 2017-06-20 16:25:40 -04:00
John Eskew
fd86e1b4b2 Merge pull request #15357 from edx/jeskew/django1.11_future_templates_PLAT_1562 
Use standard 'url' templatetag - deprecated/removed from future.
 2017-06-20 14:02:36 -04:00
Uman Shahzad
8b65ca17c5 Migrate to latest, split python-social-auth. 
PSA was monolothic, now split, with new features, like
a DB-backed partial pipeline. FB OAuth2 version also upped.

Partial pipelines don't get cleared except when necessary.
They persist for special cases like change of browser while
still mid-pipeline (i.e. email validation step).

Refactor, cleanup, and update of a lot of small things as well.

PLEASE NOTE the new `social_auth_partial` table.
 2017-06-20 22:05:36 +05:00
Sofiya Semenova
bf577fffa3 Merge pull request #15298 from edx/sofiya/preregister-cohorts 
Assign users to cohorts before registration
 2017-06-20 11:59:23 -04:00
Kyle McCormick
c22aeceab7 Truncate title in thread created event to 1000 chars 
EDUCATOR-341
 2017-06-20 11:56:53 -04:00
Ned Batchelder
03c725ef9a Merge pull request #15281 from edx/nedbat/footer-edx-link 
edx.org link for Open edX footer
 2017-06-20 11:15:06 -04:00
John Eskew
cb4ae4619b Use standard 'url' templatetag - deprecated/removed from future. 2017-06-20 10:44:16 -04:00
Ned Batchelder
6adca0ff11 Add a link to edx.org in the default Open edX footer 2017-06-20 10:18:54 -04:00
Eric Fischer
49c0342e73 Merge pull request #15167 from edx/efischer/update_celeryutils 
Make use of ChordableDjangoBackend
 2017-06-20 09:45:07 -04:00
Harry Rein
fe9cce59ab Merge pull request #15350 from edx/HarryRein/LEARNER-1483-bookmarks-styling 
Fixing styling issue on bookmarks page.
 2017-06-20 09:20:15 -04:00
Douglas Hall
dc25688096 Merge pull request #15349 from edx/douglashall/ENT-448 
ENT-448 Enterprise sign in page UI improvements.
 2017-06-20 05:37:14 -04:00
Douglas Hall
dc3a423389 Merge pull request #15293 from edx/saleem-latif/ENT-367 
ENT-367: Show Enterprise Logistration for coupon users
 2017-06-19 21:42:35 -04:00
Clinton Blackburn
d1f4e9b0a6 Updated messaging for denied verification submissions 
Learners now see a message informing them that their status is denied rather than expired.

LEARNER-1486
 2017-06-19 17:55:02 -04:00
Clinton Blackburn
02d7b794bb Added border highlight to pending verification status display 
If verification status is pending, the top border is now colored blue, in a manner similar to the success and failure states.

LEARNER-1486
 2017-06-19 17:55:02 -04:00
Harry Rein
c3b9a0efd7 Fixing styling issue on bookmarks page. 2017-06-19 12:24:03 -04:00
Ned Batchelder
be23aa47ed Fix the hyphen separators in the footer so they separate all the items 2017-06-19 12:12:28 -04:00
Salah Alomari
b8ba64cbe1 Set copyright year dynamically 2017-06-19 14:33:55 +03:00
Uman Shahzad
d5c85331c5 Automatically populate additional fields for SSO scenarios. 
When authenticating using an SAML IdP, gather additional user
data besides what is standard. Requires admin to input JSON
in settings to recognize the additional user data.
 2017-06-18 22:18:43 +00:00
Douglas Hall
7ba5e17f92 Enterprise sign in page UI improvements. 
ENT-448
 2017-06-16 14:12:38 -04:00
Harry Rein
e57e4e0c54 Merge pull request #15335 from edx/HarryRein/LEARNER-198 
Only show 'Resume Course' button for enrolled users
 2017-06-16 09:42:17 -04:00
cahrens
31d99e8d2d ED-549 Assign learner to a cohort before registration. 2017-06-16 10:23:13 +00:00
Harry Rein
d5ed3de388 Hiding 'Resume Course' button for users that are not enrolled in the course and adding test to assure behavior. 2017-06-15 17:07:03 -04:00
sanfordstudent
ceb126ef27 Merge pull request #15336 from edx/neem/cert_celery_task 
instructor task for auto cert creation
 2017-06-15 16:46:15 -04:00
Harry Rein
f226caf585 Merge pull request #15262 from edx/HarryRein/LEARNER-531-upgrade-sock 
Adding waffle-protected upgrade sock to the unified-course home and courseware pages.
 2017-06-15 15:14:02 -04:00
Adam
691d6872c7 Merge pull request #15294 from edx/adam/add-precedes-to-coursegraph-3 
write courses to neo4j in background tasks (EDUCATOR-583)
 2017-06-15 15:10:11 -04:00
Sanford Student
47db17c79e instructor task for auto cert creation 2017-06-15 14:14:52 -04:00
Harry Rein
bdf38ae00e Implemented an upgrade verification sock. 
This sock sits at the bottom of both the home and the course content pages. It allows the user to click a 'Learn More' button to open a panel that allows the user to navigate to the upgrade checkout page. The sock is only shown for users that have not yet upgraded in a course that has a verification upgrade date that has not yet passed. Python tests cover the various course mode and upgrade dates.
 2017-06-15 13:10:34 -04:00
Andy Armstrong
0b90c60b5f Merge pull request #15301 from edx/andya/webpack-jquery 
Handle issues with JQuery in Studio and LMS
 2017-06-15 12:11:28 -04:00
Clinton Blackburn
626f015a2e Added experiments app and API endpoint 2017-06-15 11:02:57 -04:00
Clinton Blackburn
0dc5000eb7 Disabled Enterprise integration for devstack 
This feature is not always needed and is not properly provisioned for devstacks.
 2017-06-15 10:46:29 -04:00
Saleem Latif
7914a00915 Show Enterprise Logistration for coupon users 2017-06-15 12:05:20 +05:00
Simon Chen
4ce1222e99 Revert "fix valid signature" 
This reverts commit e58e295ca0.

This is to fix learner-1464
 2017-06-14 16:46:54 -04:00
Nimisha Asthagiri
c21b3c8f7a Merge pull request #15323 from edx/ret/exclude-non-english-courses 
Planning Prompts experiment: exclude non-English courses
 2017-06-14 15:41:05 -04:00
Nimisha Asthagiri
d465d6f779 Planning Prompts experiment: exclude non-English courses 2017-06-14 14:03:31 -04:00
Harry Rein
6cbfb6c9f5 1) Updating version two of styling variables to use a file layout similar to the initial version. 
2) Updating the course experience sass file to use variables it can reference in the version two variable sass file.
3) Updating date styling on course home page as explained in LEARNER-1297.
4) Expanding side outline panel to take up a third and not a quarter of the content size.
 2017-06-14 12:30:14 -04:00
rabiaiftikhar
7bf0674de8 EDUCATOR-394 disable self-generated certificates when course is reset to instructor-paced 2017-06-14 19:46:59 +05:00