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

41553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
sarahkf
2b81a9409d Merge pull request #15327 from edx/sarahkf/python-template 
fixed CC logo text alternative
 2017-06-20 13:42:45 -04:00
sarahkf
dc121e54cb Merge pull request #15326 from edx/sarahkf/ARIA-roles 
fixed aria-label to just say legal
 2017-06-20 13:41:48 -04:00
Douglas Hall
4dd4f97900 Merge pull request #15370 from edx/douglashall/edx-enteprise_0_35_2 
Upgrading the edx-enterprise package to 0.35.2.
 2017-06-20 13:00:41 -04: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
Douglas Hall
f58277cc10 Upgrading the edx-enterprise package to 0.35.2. 2017-06-20 11:33:31 -04:00
Sarah Fischmann
540af5edcd Fixed legal aria-label to be a valid label 
AC-596

fixed aria-label to just say legal

translate legal label
 2017-06-20 11:33:30 -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
Eric Fischer
84aa4a2631 Merge pull request #15367 from edx/efischer/celeryutils_pypi_fun_times 
edx-celeryutils 0.2.4
 2017-06-20 10:48:24 -04:00
John Eskew
cb4ae4619b Use standard 'url' templatetag - deprecated/removed from future. 2017-06-20 10:44:16 -04:00
Adam
22a5bd3501 Merge pull request #15324 from ravi-ojha/educator_273 
Bump version of xblock-poll that resolves EDUCATOR-273
 2017-06-20 10:34:07 -04:00
Eric Fischer
112a5662ec edx-celeryutils 0.2.4 2017-06-20 10:20:06 -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
Sarah Fischmann
58bb4fbc61 Fixed CC logo text alternative 
AC-631

fixed CC logo text alternative

fixed template so python evaluates gettext()
 2017-06-20 09:49:05 -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
Ravi Ojha
56cf90f8e9 Bump version of xblock-poll that resolves EDUCATOR-273 2017-06-20 02:43:46 +05:30
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
Jesse Shapiro
62680bf7c6 Merge pull request #15305 from open-craft/uman/OC-2682 
[ENT-423] Automatically populate Country field for SSO scenarios
 2017-06-19 10:44:11 -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
9ecc2938f5 Merge pull request #15347 from edx/douglashall/edx-enteprise_0_35_0 
Upgrading edx-enterprise package to 0.35.0
 2017-06-16 16:49:52 -04:00
Douglas Hall
7ba5e17f92 Enterprise sign in page UI improvements. 
ENT-448
 2017-06-16 14:12:38 -04:00
Douglas Hall
6910a3a0b7 Upgrading edx-enterprise package to 0.35.0 2017-06-16 13:39:33 -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
Simon Chen
8185b5cea1 Merge pull request #15328 from edx/schen/learner-1464 
Revert "fix valid signature" from OSPR-1539
 2017-06-15 08:29:58 -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
Harry Rein
1904a93ad2 Merge pull request #15315 from edx/HarryRein/LEARNER-1297-course-date-formatting 
LEARNER-1297: Updating date formatting in course home page.
 2017-06-14 14:58:34 -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
Nimisha Asthagiri
d465d6f779 Planning Prompts experiment: exclude non-English courses 2017-06-14 14:03:31 -04:00
Christina Roberts
09e22f373b Merge pull request #15312 from edx/christina/share-template 
Remove extra div.
 2017-06-14 13:36:36 -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