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

14786 Commits

Author SHA1 Message Date
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
Muhammad Ammar
4622b24ab4 Merge pull request #15385 from edx/ammar/fix-video-flaky-test 
fix video flaky test
 2017-06-23 17:10:15 +05:00
muhammad-ammar
4d609f80ea fix video flaky test 
EDUCATOR-607
 2017-06-23 15:57:27 +05:00
Jeremy Bowman
5a6b8cd35b PLAT-1228 Support bok-choy in Docker Devstack 2017-06-22 15:03:12 -04:00
Alex Dusenbery
fb36c7df6c EDUCATOR-514 | Add certificate_available_date field to CourseFields 2017-06-21 11:57:38 -04:00
Afzal Wali Naushahi
2b4fb4fd95 Merge pull request #15180 from edx/clintonb/multi-tenant-catalog-integration 
Updated CatalogIntegration to use a site-specific URL
 2017-06-21 15:31:53 +05:00
Afzal Wali
8173182c86 Taking the url change behind the waffle switch. Required for the Learner-1146 
Learner-1111
 2017-06-21 14:02:14 +05: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
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
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
cahrens
31d99e8d2d ED-549 Assign learner to a cohort before registration. 2017-06-16 10:23:13 +00: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
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
Robert Raposa
3b70b9b7f4 Merge pull request #15322 from edx/robrap/bokchoy-comment 
Add comment to save future self time.
 2017-06-14 14:19:01 -04:00
Ned Batchelder
47f42fdc10 Merge pull request #14591 from mitodl/pdpinch/better-error-from-codejail 
Return only error value to students when codejail raises an exception
 2017-06-14 12:58:58 -04:00
Robert Raposa
340fb2b082 Add comment to save future self time. 2017-06-14 11:52:25 -04:00
Christina Roberts
23d480f457 Merge pull request #15306 from edx/christina/edu-511 
Remove skip from test where failure cannot be reproduced
 2017-06-14 09:15:11 -04:00
Peter Pinch
b9e768410f return only error value to students when codejail raises an exception 
remove comment for translators

inst.args[0] is more reliable than inst.message

consistent escaping
 2017-06-13 21:17:00 -04:00
Andy Armstrong
4ed9776a4b Handle issues with JQuery in Studio and LMS 
LEARNER-1341
 2017-06-13 20:53:29 -04:00
Andy Armstrong
c0007a11f3 Add new course search results page 
LEARNER-1112
 2017-06-13 16:36:32 -04:00
cahrens
04bf257d91 Remove flaky decorator. 
Test passed > 130 times. Perhaps
querying for the content changes timing.
 2017-06-13 15:10:38 -04:00
Eric Fischer
3ea7a18994 Revert "Merge pull request #15309 from edx/efischer/fix_studio_link_tests" 
This reverts commit 8ca5c11a2b, reversing
changes made to 1acb51559a.
 2017-06-13 13:52:31 -04:00
Sylvia Pearce
fe3105cc38 Update Studio help tokens following doc reorg for Publisher 2017-06-13 13:52:07 -04:00
Eric Fischer
8ca5c11a2b Merge pull request #15309 from edx/efischer/fix_studio_link_tests 
Skip failing tests temporarily
 2017-06-13 12:50:45 -04:00
Eric Fischer
9e6b449a62 Skip failing tests 2017-06-13 11:59:42 -04:00
Brandon Baker
7d2d0657fe Merge pull request #15290 from edx/bbaker/educator-344 
Bbaker/educator 344
 2017-06-13 10:42:35 -04:00
Giulio Gratta
2b25c9fc78 Enable DEFAULT_MODE to be customized in config 
- Keeps platform set default of "Audit" to be backwards compatible and not break stuff
- get COURSE_MODE_DEFAULTS from config if set
 2017-06-12 14:09:00 -04:00
Brandon Baker
6b62bf9b4b EDUCATOR-344 
Removed extraneous instances of track_function
 2017-06-12 14:45:37 +00:00
Ibrahim Ahmed
07dc1e6b20 Merge pull request #15248 from edx/ibrahimahmed443/LEARNER-1127 
Exclude hidden programs from white label course page and home page
 2017-06-10 03:41:09 +05:00
Brandon Baker
f4c9044d2e EDUCATOR-344 
Removed instances of track function
 2017-06-09 18:51:10 +00:00
Ibrahim
9995716899 Exclude hidden programs from white label course and homepage 
LEARNER-1126, LEARNER-1127
 2017-06-09 21:42:21 +05:00
Marko Jevtic
2422728671 LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products 2017-06-09 12:29:29 +02:00
Sofiya Semenova
6acc6fde95 ED-367 log in production 2017-06-08 18:48:26 +00:00
Muhammad Ammar
e748652840 Merge pull request #15199 from edx/ammar/edu-211-html5-player-overlay-play-button 
show play button overlay
 2017-06-08 11:46:41 +05:00
Eric Fischer
a4433e7ab3 database fixture updates 2017-06-07 14:10:56 -04:00
Albert (AJ) St. Aubin
27b0dc9fd1 Merge pull request #15037 from edx/christina/ed11-simplification 
Feature branch: dividing discussions by enrollment tracks
 2017-06-07 13:22:13 -04:00
muhammad-ammar
e89c08d84d show play button overley 
EDUCATOR-211
 2017-06-07 17:04:37 +05:00
Albert St. Aubin
fd7ac21608 Working publisher/subscriber events for Cohorts and discussions 2017-06-06 13:58:54 -04:00
Jesse Zoldak
b8ca90eaab Mark test_rescore_nonrescorable bok choy test as flaky 2017-06-06 12:18:28 -04:00
Jesse Zoldak
f843736a5e Mark test_can_reset_attempts test as flaky 2017-06-06 12:15:42 -04:00
Jesse Zoldak
f3498c5de8 Skip test_edit_course_wiki 2017-06-06 12:11:12 -04:00
Andy Armstrong
3cffded2d1 Improve course breadcrumbs 
LEARNER-877
 2017-06-05 18:06:05 -04:00
cahrens
3abc7dc07e isort updates 2017-06-05 13:47:48 -04:00
cahrens
e1916eb973 AutoAuthPage moved. 2017-06-05 13:28:24 -04:00
cahrens
36c51450c2 Adds in radio button patch request and text for page 
EDUCATOR-229
 2017-06-05 13:00:31 -04:00
cahrens
79c5137a68 Bok choy tests for division scheme. 
EDUCATOR-424
 2017-06-05 12:59:51 -04:00
Albert St. Aubin
c23c0b991b EDUCATOR-141: Moved the Discussions Mgt to its own tab and updated tests 2017-06-05 12:59:51 -04:00