Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
Clinton Blackburn
beba48a5d4 Added model and API endpoints for experiment-scoped data 2017-06-28 16:25:39 -04:00
Clinton Blackburn
be51c71913 Added ExperimentData API endpoint for bulk upserts 
This endpoint allows the Rapid Experiments Team to quickly update data for multiple learners.
 2017-06-28 16:25:39 -04:00
Clinton Blackburn
a42264715b Corrected create permissions for ExperimentData create endpoint 2017-06-27 19:35:31 -04:00
Omar Al-Ithawi
1b46c3e646 Add optional support for Unicode usernames 
Refactoring: Use format with named variables
 2017-06-27 14:18:49 +03:00
Gregory Martin
3e805fa61b add cert task firing on whitelist append 2017-06-26 11:44:38 -04:00
George Song
32deb6a66a Merge pull request #15258 from mreyk/teltek/bugfix/sysadmin-csv-download 
Fix sysadmin csv download as unicode
 2017-06-26 06:41:39 -07:00
Brian Mesick
f9216656fc Merge pull request #15393 from edx/bmedx/django_1.11_upgrade_mock_django_PLAT_1494 
Remove mock-django dependency
 2017-06-23 16:36:50 -04:00
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
bmedx
41def5c938 Remove mock-django dependency 
- PLAT-1494 since mock-django only seems to support up to Django 1.9a1, and is only used in one file we're opting to try to simplify and remove the dependency.
 2017-06-23 09:22:11 -04: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
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
6adca0ff11 Add a link to edx.org in the default Open edX footer 2017-06-20 10:18:54 -04:00
Salah Alomari
b8ba64cbe1 Set copyright year dynamically 2017-06-19 14:33:55 +03: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
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
Clinton Blackburn
626f015a2e Added experiments app and API endpoint 2017-06-15 11:02:57 -04: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
d465d6f779 Planning Prompts experiment: exclude non-English courses 2017-06-14 14:03:31 -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
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
Noraiz Anwar
5b400bc0b3 Merge pull request #15319 from edx/revert-15163-ri/EDUCATOR-394-disable-self-generation-certificates 
Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced."
 2017-06-14 18:04:30 +05:00
Asad Iqbal
d4e1e3eb22 Merge pull request #15272 from edx/asadiqbal08/ENT-368 
ENT-368 Hide Register or Sign In links in Header on Logistration
 2017-06-14 16:54:24 +05:00
Noraiz Anwar
371c422aaf Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced." 2017-06-14 15:57:07 +05:00
rabiaiftikhar
2eab85ebf7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-14 13:38:29 +05:00
asadiqbal
cd896501ca ENT-368 2017-06-14 11:50:37 +05: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
Nimisha Asthagiri
764c310c80 Merge pull request #15314 from edx/ret/add-todo-comments-ivp 
Add comments around In-course verification prompt throwaway code
 2017-06-13 17:28:38 -04:00
Andy Armstrong
c0007a11f3 Add new course search results page 
LEARNER-1112
 2017-06-13 16:36:32 -04:00
Calen Pennington
39048048da Add comments around In-course verification prompt throwaway code 2017-06-13 15:18:46 -04:00
Sarah Fischmann
eafb79defc Added lang attribute in LMS and Studio; added language col to course_overviews 
Added course level lang attribute for LMS

added lang attribute to Studio

fixed error when trying to get language attribute on course that does not exist

simplified code

added lang attribure to more places in LMS, added migration for language attribute in course_overview

fixing contraints in the database for language attribute

added lang attribute to several more places in LMS and Studio

added lang attribute to discussion and custom pages; cleaned up code

fixed issue that was causing test failures

moved lang attribute higher in tree in two places
 2017-06-13 14:42:29 -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
rabiaiftikhar
22d3b02807 respond to comments 2017-06-13 16:29:17 +05:00
rabiaiftikhar
b84d4c0209 Review Rehan 2017-06-13 15:43:36 +05:00
rabia23
a8913f9a66 Review Alex 2017-06-13 06:51:38 +00:00
rabia23
bb219ed4a7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-12 11:24:30 +00:00