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

84 Commits

Author SHA1 Message Date
Harry Rein
a7e4a87b66 Fixing quality issue with recent merge. 2017-06-23 15:27:33 -04:00
Harry Rein
e0ff40c0fc Merge pull request #15372 from edx/andya/pluggable-course-tools 
Introduce a course_tool plugin entry point and convert Updates, Bookmarks and Reviews into entry points.
 2017-06-23 15:13:51 -04:00
Andy Armstrong
2842533eb4 Introduce a course_tool plugin entry point and migrate the updates, bookmarks and reviews tools into plugins. 2017-06-23 15:11:28 -04:00
Calen Pennington
6dc5cb498e Put the verification-sock html on the page all the time so that we can easily experiment on it with optimizely 2017-06-23 13:14:03 -04: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
Diana Huang
3d09290c14 Add a dismiss button to welcome message. 
Store user's preference indefinitely.
 2017-06-22 18:26:50 -04:00
Alex Dusenbery
f7f6ac15ca Have TestWelcomeMessageView runs succeed deterministically when test order is shuffled. 2017-06-21 15:00:29 -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
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
Clinton Blackburn
f318661df5 Updated CatalogIntegration to use a site-specific URL 
The internal_api_url field has been deprecated. All usages have been updated with calls to the method get_internal_api_url().

LEARNER-1111
 2017-06-20 18:38:56 +05: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
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
Saleem Latif
7914a00915 Show Enterprise Logistration for coupon users 2017-06-15 12:05:20 +05: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
Nimisha Asthagiri
7d6ab17385 Merge pull request #15316 from edx/ret/planning-prompt-population 
Planning Prompts experiment: check content availability date
 2017-06-14 09:10:03 -04:00
Andy Armstrong
1592ee2b15 Merge pull request #15173 from edx/andya/course-search-page 
Enable course search for the unified course experience
 2017-06-13 17:41:26 -04:00
Nimisha Asthagiri
3bbeb75c58 Planning Prompts experiment: check content availability date 2017-06-13 17:32:56 -04:00
Andy Armstrong
c0007a11f3 Add new course search results page 
LEARNER-1112
 2017-06-13 16:36:32 -04:00
Andy Armstrong
0096c80a13 Refactor course search into openedx/features 2017-06-13 15:30:09 -04:00
Calen Pennington
39048048da Add comments around In-course verification prompt throwaway code 2017-06-13 15:18:46 -04:00
Nimisha Asthagiri
fdafd53a66 Upsell Courses in Courseware, CourseOutline, Discussions, Progress 2017-06-08 14:29:42 -04:00
Andy Armstrong
3cffded2d1 Improve course breadcrumbs 
LEARNER-877
 2017-06-05 18:06:05 -04:00
Douglas Hall
214ff5c19b Merge pull request #15187 from open-craft/replaceafill/ENT-378 
[ENT-378] Remove code for custom header logo
 2017-06-02 16:03:09 -04:00
Harry Rein
6761a87bfb Fix for LEARNER-859: Updating styling on the course updates page to more clearly differentiate between multiple updates. Specifically: 
- Updated styling on date in the top left corner
- Added horizontal line between updates
- Removed ability to toggle updates on and off
- Cleaned up code to always show all updates:
 2017-06-01 16:43:09 -04:00
Robert Raposa
eaab2cf444 Add course overrides of waffle flags. 2017-06-01 15:12:50 -04:00
Douglas Cerna
de4691e35c Removed code associated with ENT-32 2017-06-01 09:34:47 -06:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00
Matt Drayer
ea195ff28a Merge pull request #15118 from edx/mattdrayer/hide-audit-enterprise 
ENT-405: Hide the audit option from track selection for certain enterprise scenarios
 2017-05-26 09:20:01 -04:00
Andy Armstrong
643d9eda7d Merge pull request #15191 from edx/andya/use-isort 
Add isort to edx-platform
 2017-05-25 14:51:52 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
Andy Armstrong
f81c21902e Add isort to edx-platform 
LEARNER-1168
 2017-05-25 11:39:43 -04:00
Matt Drayer
5f5a44e062 Hide the audit option from track selection for certain enterprise use cases 2017-05-22 17:14:27 -04:00
Jesse Shapiro
73c41388ce Merge pull request #15025 from open-craft/haikuginger/enterprise-branded-logistration 
[ENT-336][ENT-337][ENT-338] Enterprise registration/login form updates
 2017-05-18 17:20:56 -04:00
Jesse Shapiro
65dafe9fe5 Add Enterprise sidebar to login and registration views; remove unneeded fields; make registration form more narrow 2017-05-17 20:49:05 -04:00
Diana Huang
9ecbc9bf48 Replace urls in the welcome message. 2017-05-17 12:26:30 -04:00
asadiqbal
8fc31b42e3 ENT-374 Support ticket is created without enterprise tags for Anonymous users. 2017-05-15 13:24:45 +05:00
Brian Jacobel
480a3ca60b Move course import JS to Webpack 2017-05-12 14:40:31 -04:00
Diana Huang
61c0ec7f42 Merge pull request #15096 from edx/diana/masquerade-issues 
Fix test to use the start instead of due date.
 2017-05-11 17:12:00 -04:00
Diana Huang
ef5c23c59c Fix test to use the start instead of due date. 2017-05-11 14:16:26 -04:00
Andy Armstrong
482f76527e Merge pull request #15064 from edx/andya/welcome-message 
Show a welcome message on the course home page
 2017-05-10 17:40:25 -04:00
Andy Armstrong
64de44321b Show a welcome message on the course home page 
LEARNER-879
 2017-05-10 16:53:15 -04:00
Robert Raposa
8569cb3587 Fix logic error in calculating last accessed. 2017-05-10 13:48:22 -04:00
Andy Armstrong
9ce46a3fb5 Improve course experience tests 2017-05-05 13:55:59 -04:00
Andy Armstrong
75a0fdf0eb Enable course sidebar for new course home page 
LEARNER-764
 2017-05-05 13:55:59 -04:00
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Robert Raposa
1262bf74e5 Skip test. 2017-05-04 16:56:09 -04:00
Robert Raposa
86637d7f6c Various test fixes. 2017-05-04 15:21:27 -04:00
Robert Raposa
3b31270e07 Fix Start Course vs Resume Course using Course Blocks. 2017-05-03 15:02:42 -04:00
asadiqbal
47cdf39266 ENT-342 2017-05-03 15:03:34 +05:00