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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Jacobel
e8d2a626d4 Merge pull request #12417 from edx/bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 
Fix release 2016 05 10 merge conflicts with master
 2016-05-10 13:03:19 -04:00
AlasdairSwan
599070e5ef Merge pull request #12412 from edx/alasdair/program-listing-certificate-fix 
If not certificates remove the container element from the DOM
 2016-05-10 13:00:11 -04:00
Régis Behmo
fe41e50d74 Include non-obsolete location info in student profile report 
The student profile report that can be downloaded from the course staff
dashboard included the "location" field (which is obsolete) and the
mailing address, which is seldom completed. Here, we add the "country"
and "city" fields to the csv report. To do so, we need to be able to
dump the new fields to JSON so we convert the user fields to unicode
when needed.

Note that this breaks compatibility with earlier reports.
 2016-05-10 18:25:15 +02:00
Brian Jacobel
d88aad7d79 Merge branch 'release' into bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 2016-05-10 12:15:42 -04:00
AlasdairSwan
9becd565b3 If not certificates remove the container element from the DOM 2016-05-10 11:42:29 -04:00
cahrens
a49cdc7a1a These old discussion templates are not referenced in the codebase. 2016-05-10 10:46:59 -04:00
Brian Jacobel
8a5a69f4cd Merge pull request #12392 from edx/rc/2016-05-10 
Release Candidate rc/2016-05-10
 2016-05-10 09:47:00 -04:00
tasawernawaz
6404150365 Merge pull request #12403 from edx/tasawer/story/ecom-3729-update-verification-status-area 
Update student verification area
 2016-05-10 18:00:50 +05:00
Chris Rodriguez
e5a8c2220f Updating icons to work in high contrast mode 2016-05-10 08:33:03 -04:00
Chris Rodriguez
82cd5a7283 AC-399 making buttons with title and sr text 2016-05-10 08:33:03 -04:00
Awais Jibran
db05aeb7e0 Merge pull request #12384 from edx/aj/fix-cms-dashboard-for-ccx 
Studio Edge cannot load the Course Dashboard for CCX courses.
 2016-05-10 17:29:01 +05:00
Chris Rodriguez
6951497a16 AC-396 updating courseware nav to display correctly on high contrast displays 2016-05-10 08:23:36 -04:00
attiyaIshaque
459a01ac3a Merge pull request #12269 from edx/attiya/ECOM-4269-and-4270 
Screenreader added to the button "Upgrade to Verified" in LMS Dashboard.
 2016-05-10 14:26:07 +05:00
Tasawer
03e241ecc4 Update student verification area 
ECOM-3729
 2016-05-10 09:11:51 +00:00
attiyaishaque
dbad1881d2 Screenreader added to the button "Upgrade to Verified" and "View Xseries Details" in LMS Dashboard. 2016-05-10 12:42:12 +05:00
Douglas Hall
632c38f6ed Merge pull request #12404 from edx/ibrahimahmed443/WL-443-delete-button-height-adjustment 
fix height of delete button to match the attached text field
 2016-05-09 16:37:50 -04:00
Christina Roberts
e953044786 Merge pull request #12388 from edx/christina/course-search-cohort-test 
Fix flaky cohort tests
 2016-05-09 15:51:31 -04:00
sanfordstudent
40c74c3a7a Merge pull request #12406 from edx/sstudent/TNL-4530 
removing redundant fields from outline.selected event
 2016-05-09 15:18:24 -04:00
AlasdairSwan
4a9e7c748c Merge pull request #12380 from edx/alasdair/ECOM-4213-move-program-list-to-pattern-library 
Alasdair/ecom 4213 move program list to pattern library
 2016-05-09 15:05:55 -04:00
Brian Jacobel
fdf7fc04ef Merge pull request #12407 from edx/benp/fix-lint-rc-2016-05-10 
Fix linting issue.
 2016-05-09 14:16:58 -04:00
Nimisha Asthagiri
68173b6dce Set infinite timeout for Block Structure cache entries 2016-05-09 14:11:36 -04:00
AlasdairSwan
2fe52df720 UPdated a11y approach for program card progress bars 2016-05-09 13:52:55 -04:00
Ben Patterson
c00355ae51 Fix linting issue. 2016-05-09 13:26:34 -04:00
Sanford Student
4e7a24e706 removing redundant fields rom outline.selected event 2016-05-09 13:24:32 -04:00
Adam
4d6f8ea7c1 Merge pull request #12393 from edx/add-discussion-id-to-export 
add discussion_id to course structure dump command (AN-6696)
 2016-05-09 13:21:05 -04:00
Clinton Blackburn
e7df92b765 Merge pull request #12405 from edx/clintonb/credit-fixes 
Multiple Credit Fixes
 2016-05-09 13:09:44 -04:00
Clinton Blackburn
78f4af7d6f Updated credit requirements logic 
Credit eligibility can be updated up to the point that the course is closed or the student submits a request for credit. Credit eligibility cannot be removed.

ECOM-4379
 2016-05-09 12:52:54 -04:00
Clinton Blackburn
17e92f5518 Credit test cleanup 
Removed a lot of duplicate code!

ECOM-4379
 2016-05-09 12:52:49 -04:00
Clinton Blackburn
46775d0f2d Exposing CreditRequirement and CreditRequirementStatus in admin 
ECOM-4379
 2016-05-09 12:52:43 -04:00
Chris Rodriguez
96ca09f45c Membership page label additions and fixes 2016-05-09 12:32:46 -04:00
Adam Palay
bfb319db9a add discussion_id to course structure dump command (AN-6696) 
add test case for discussion_id already set in XML
 2016-05-09 11:24:37 -04:00
cahrens
7ff3c4b3fb Verify New Cohort form is rendered. 
TNL-2257
 2016-05-09 11:21:06 -04:00
wajeeha-khalid
05f00a827c Merge pull request #12132 from edx/jia/MA-2247 
MA-2247: CourseBlockAPI - return discussion student view data
 2016-05-09 18:23:01 +05:00
wajeeha-khalid
05b2e65e0f MA-2247 return student view data for discussion module 2016-05-09 17:37:31 +05:00
Awais Jibran
38f1c200ca Fixing test 2016-05-09 17:35:41 +05:00
Ibrahim
a51143fe38 fix height of delete button to match the attached text field 2016-05-09 16:58:01 +05:00
reciproco
c9727a2bbb Fix CRI-57 Bug 
Fix error in instructor dashboard, data download section, when trying to download a csv with the issued certificates in a spanish (es-419) configured edx-platform deployment returns a UnicodeEncodeError: 'ascii' codec can't encode character u'\xf3' in position 16: ordinal not in range(128)
 2016-05-08 22:18:12 +02:00
Brian Jacobel
24b1c54b8d Merge branch 'release' into rc/2016-05-10 2016-05-07 10:32:39 -04:00
Douglas Hall
5496ec2ac1 Merge pull request #12399 from edx/merge-patch-2016-05-06-into-master 
Merge patch 2016 05 06 into master
 2016-05-07 10:23:41 -04:00
Douglas Hall
a90840a501 Merge remote-tracking branch 'origin/release' into merge-patch-2016-05-06-into-master 2016-05-06 17:30:51 -04:00
Douglas Hall
e4ed23faa3 Merge pull request #12367 from edx/rc/2016-05-05 
Patch Release 2016-05-05
 2016-05-06 17:22:56 -04:00
Carol Tong
26ea2dff56 Merge pull request #12311 from edx/carol/doc/DOC-2862_All 
DOC-2862: Add doc for Courses API
 2016-05-06 17:08:32 -04:00
Brian Jacobel
5cbeea7b66 Merge pull request #12394 from edx/renzo/cherry-pick-sprintf-revert 
Revert "Add js test for analytics event on LMS receipt page"
 2016-05-06 16:22:46 -04:00
Renzo Lucioni
93b1131192 Revert "Add js test for analytics event on LMS receipt page" 
This reverts commit f995114d11.
 2016-05-06 16:02:58 -04:00
Renzo Lucioni
0a61ab7549 Merge pull request #12389 from edx/renzo/fix-sprintf-bug 
Revert "Add js test for analytics event on LMS receipt page"
 2016-05-06 16:01:41 -04:00
John Eskew
e50c660805 Merge pull request #12346 from edx/jeskew/django_upgrade_1_8_13 
Upgrade to Django 1.8.13
 2016-05-06 15:57:50 -04:00
Carol Tong
a1394e9945 Add documentation for Courses API 2016-05-06 15:40:21 -04:00
Calen Pennington
ccaafce05b Merge pull request #12205 from cpennington/disable-caching-in-tests 
Disable caching in LMS tests
 2016-05-06 15:22:48 -04:00
Alison Hodges
a422ad60f7 corrects guide name in template 2016-05-06 14:48:59 -04:00
Alison Hodges
289a4a2abe Merge pull request #12382 from edx/ahodges/DOC-2866 
Updates link to learner info in Numerical Input template
 2016-05-06 14:46:22 -04:00