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

16328 Commits

Author SHA1 Message Date
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
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
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
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
4ed9776a4b Handle issues with JQuery in Studio and LMS 
LEARNER-1341
 2017-06-13 20:53:29 -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
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
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
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
Dmitry Viskov
0272b84fd0 Open Response Assessment tab for Instructor Dashboard - bugfix (prevent loading ORA Block more than one time) 2017-06-13 12:58:19 -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
511e653627 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-13 06:54:38 +00:00
rabia23
a8913f9a66 Review Alex 2017-06-13 06:51:38 +00: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
Adam Palay
51abe89a80 respond to comments 2017-06-12 11:55:58 -04:00
Adam Palay
69d76b69d7 write courses to neo4j in background tasks (EDUCATOR-583) 
move tasks into tasks.py

add more logging
 2017-06-12 10:44:27 -04:00
rabia23
bb219ed4a7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-12 11:24:30 +00:00
rabia23
6484580107 fix coursekey error 2017-06-12 11:19:17 +00:00