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

36857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Drayer
f1538132e4 Merge pull request #12315 from edx/mattdrayer/course-mode-bulk-sku 
mattdrayer/course-mode-bulk-sku: Add new CourseMode field
 2016-05-11 12:47:55 -04:00
Douglas Hall
f81e90fb33 Merge pull request #12427 from edx/release 
Merging Hotfix Release 2016-05-11 back to master
 2016-05-11 12:17:31 -04:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field 
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
 2016-05-11 10:57:24 -04:00
Douglas Hall
9c834feb35 Merge pull request #12420 from edx/hotfix/2016-05-11 
Hotfix 2016-05-11
 2016-05-11 10:53:47 -04:00
Robert Raposa
e57777d3fb Merge pull request #12425 from edx/robrap/revert-safe-commit 
Revert: Enhance Jenkins integration of safe template linting
 2016-05-11 10:01:42 -04:00
Robert Raposa
5ea529ae39 Revert: Enhance Jenkins integration of safe template linting 2016-05-11 09:56:23 -04:00
Christina Roberts
8340703f41 Merge pull request #11620 from openfun/regisb/include_geo_data_in_student_profile_report 
Include non-obsolete location info in student profile report
 2016-05-11 09:25:59 -04:00
Robert Raposa
ad4e185f0d Merge pull request #12391 from edx/robrap/jenkins-rule-thresholds 
TNL-4509: Set Jenkins thresholds per rule.
 2016-05-11 09:14:51 -04:00
Douglas Hall
4bd7b71f99 Remove course details field character limits 2016-05-10 16:00:54 -04:00
Robert Raposa
afdec6a99b Enhance Jenkins integration of safe template linting 
- Add rule based thresholds
- Add safecommit to Jenkins
 2016-05-10 15:50:45 -04:00
Douglas Hall
98f6785bc3 Merge pull request #12418 from edx/douglashall/WL-453/remove_course_details_field_character_limits 
WL-453 Remove course details field character limits
 2016-05-10 15:45:40 -04:00
Robert Raposa
80c3f84262 Fix safe template issues for 0 violations for some rules 2016-05-10 15:35:57 -04:00
Robert Raposa
73966d1a05 Add output of violation counts by rule 2016-05-10 15:35:57 -04:00
Douglas Hall
24b4d5d29f Remove course details field character limits 2016-05-10 13:23:04 -04:00
Nimisha Asthagiri
dced13a827 Merge pull request #12397 from edx/tnl/block-transformer-memcache 
Set infinite timeout for Block Structure cache entries
 2016-05-10 13:17:42 -04:00
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
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
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
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
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
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