Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,161 Commits 1 Branch 0 Tags
292cd93131bfde53fdc50ea774f38dbfa5346fec
Commit Graph

37161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
292cd93131 Focus seems to be flaky when running tests. 
TNL-4561
 2016-05-28 22:03:35 -04:00
Peter Desjardins
4f71e26368 Merge pull request #11703 from edx/docs/context-help 
LMS Online Contextual Help
 2016-05-27 15:12:53 -04:00
Robert Raposa
8a30a54d7a Merge pull request #12536 from edx/robrap/linter-concat-html 
Fix false positives on javascript_contact_html.
 2016-05-27 14:40:27 -04:00
Robert Raposa
ff862612da Fix false positives on javascript_contact_html. 2016-05-27 13:23:54 -04:00
Nimisha Asthagiri
4a56fa5fb1 Adding infrastructure to support context-sensitive help links in the LMS. 2016-05-27 11:35:05 -04:00
Douglas Hall
641f29b671 Merge pull request #12525 from edx/afzaledx/sol-1802_zendesk_tickets_for_suspicious_proctored_attempts 
(WIP) SOL-1802 Create Zendesk ticket when "Suspicious" proctored exam reviews are received from the proctoring provider
 2016-05-27 10:15:16 -04:00
Renzo Lucioni
85ca1f3e03 Merge pull request #12575 from edx/renzo/program-detail-data 
Include raw program data on the detail page
 2016-05-27 10:01:19 -04:00
Cliff Dyer
4e77d50982 Merge pull request #12396 from edx/cdyer/grading-transformer 
Add transformer to collect grades data
 2016-05-27 09:39:34 -04:00
Afzal Wali
eadd656df0 SOL-1802 Allow proctoring service to create support ticket. 2016-05-27 09:29:06 -04:00
brianhw
0f0ea0cf6c Merge pull request #12522 from edx/brian/cms-course-content-export 
Define CMS management command for research course exports
 2016-05-26 22:44:57 -04:00
Brian Wilson
a36aa68fd7 Add new export_olx management command. 
This moves the functionality of the 'export_course'  management command from lms/djangoapps/courseware
over to the Studio codebase.  This reflects its use going forward to be run with cms settings, to
export the content of the Studio modulestore instead of the LMS modulestore.  The management
command is used by an analytics workflow to output course content for researchers.
 2016-05-26 17:26:59 -04:00
J. Clifford Dyer
7b75d1d452 Add transformer that collects grading data. 
TNL-4449
 2016-05-26 16:15:34 -04:00
Clinton Blackburn
f6d9c9a324 Added scopes claim to JWT access tokens (#12571) 
This will allow API servers to limit access based on scopes.
 2016-05-26 15:45:07 -04:00
Renzo Lucioni
a6b972549a Include raw program data on the detail page 
Uses the view's ID argument to retrieve and drop unmodified programs API data on the details page. Future work will supplement with CourseOverviews data. Part of ECOM-4415.
 2016-05-26 15:33:08 -04:00
Eric Fischer
a9a3fabfe8 Bulk Email Multiselect (#12301) 
TNL-4356

Allows multiple bulk email targets to be specified at once.

-The previous "All" option has been split into "Staff" and "Learners"
-The backend changes made here lay the groundwork for cohort emailing
-The data migration, 0005, is somewhat large and requires deploy attention
-Tests have been updated
-Numerous safe-commit-linter fixes are included
 2016-05-26 14:22:04 -04:00
Renzo Lucioni
37eedf07db Merge pull request #12572 from edx/renzo/program-detail-routing 
Adjust program detail page URL routing
 2016-05-26 13:16:16 -04:00
Ned Batchelder
ff6e9b7f3f Merge pull request #12570 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-26 12:38:27 -04:00
Renzo Lucioni
e77166c2b0 Adjust program detail page URL routing 
The new URL pattern expects a program ID and allows a program name to be included, if desired. It will match paths like 'programs/123/' and 'programs/123/foo/', but not 'programs/123/foo/bar/'. The given ID is passed to the view, where it will be used to retrieve program data. Part of ECOM-4415.
 2016-05-26 12:17:21 -04:00
Renzo Lucioni
9fa2dc0333 Merge pull request #12565 from edx/renzo/program-by-id 
Extend edX API utility to support retrieval of specific resources
 2016-05-26 12:10:09 -04:00
Ned Batchelder
10f7c9bb2f Update translations (autogenerated message) 2016-05-26 15:57:37 +00:00
Simon Chen
3c9a328b62 Merge pull request #12558 from edx/schen/ECOM-4218 
ECOM-4218 Draft 1 for Course Cards on program details page
 2016-05-26 11:47:57 -04:00
Simon Chen
c60cf3911c ECOM-4218 Draft 1 for Course Cards on program details page 2016-05-26 10:56:30 -04:00
Renzo Lucioni
62403eea40 Extend edX API utility to support retrieval of specific resources 
This will be used to retrieve data for the program detail page. Part of ECOM-4415.
 2016-05-26 10:34:48 -04:00
Ben Patterson
c194e420bd Merge pull request #12569 from edx/benp/upgrade-radon 
Upgrade radon to repair import issue.
 2016-05-26 10:33:54 -04:00
Ben Patterson
3764521ba9 Upgrade radon to repair import issue. 2016-05-26 09:13:48 -04:00
clrux
0bcb378a6d Merge pull request #12419 from edx/clrux/ac-454 
AC-454 adding visual clarity for selected menu options in the video player
 2016-05-26 06:04:09 -04:00
AlasdairSwan
9d3bd8e9cf Merge pull request #12550 from edx/alasdair/ECOM-4216-program-details-header 
ECOM-4216 Program Details Header View
 2016-05-25 18:21:37 -04:00
AlasdairSwan
dd9d465772 ECOM-4216 Program Details Header View 2016-05-25 16:54:02 -04:00
Nimisha Asthagiri
ee5e61f2a4 Merge pull request #12564 from edx/release 
Merge hotfix-2016-05-25
 2016-05-25 16:17:40 -04:00
Chris Rodriguez
4175616519 AC-454 adding visual clarify for selected menu options 2016-05-25 15:50:22 -04:00
Clinton Blackburn
079dc97261 Merge pull request #12562 from edx/clintonb/jwt-fix 
Added administrator bit to JWT access token
 2016-05-25 15:49:00 -04:00
Nimisha Asthagiri
47ad57b822 Merge pull request #12560 from edx/hotfix/2016-05-25 
Hotfix: Invalidate, don't update, Block structure cache in CMS
 2016-05-25 15:31:07 -04:00
Robert Raposa
ebf89d63e9 Merge pull request #12541 from edx/robrap/fix-imports 
Fix import order for HTML, Text.
 2016-05-25 15:23:08 -04:00
Diana Huang
e613b7f460 Merge pull request #12556 from edx/diana/discussion-a11y 
Add a11y tags on accessibility tests.
 2016-05-25 15:12:21 -04:00
Clinton Blackburn
38148679dc Added administrator bit to JWT access token 2016-05-25 14:35:13 -04:00
Nimisha Asthagiri
7da42ec769 Hotfix: Revert block structure caching changes 2016-05-25 13:26:16 -04:00
Bill DeRusha
5af72a0dea Merge pull request #12557 from edx/release 
Merge Hotfix-2016-05-24 into Release
 2016-05-25 13:15:52 -04:00
Matt Drayer
f99723817b Merge pull request #12523 from edx/asadiqbal08/WL-479 
WL-479 Enable Bulk purchase for anonymous user
 2016-05-25 12:01:43 -04:00
Fred Smith
b3462e5b1c Merge pull request #12544 from edx/derf/override_SES_email_region 
override SES email region
 2016-05-25 11:16:47 -04:00
Bill DeRusha
05db98301f Merge pull request #12554 from edx/hotfix/2016-05-24 
Moving main element up higher to not conflict with chart
 2016-05-25 11:09:37 -04:00
Diana Huang
cbe9142996 Add a11y tags on accessibility tests. 2016-05-25 10:59:24 -04:00
asadiqbal
63a30a3110 WL-479 Enable Bulk purchase for anonymous user 2016-05-25 10:40:35 -04:00
Diana Huang
53f6d40d45 Merge pull request #12542 from edx/diana/discussion-a11y 
Add accessibility tests for discussion forums.
 2016-05-25 10:16:38 -04:00
Fred Smith
8a9df36809 update django-ses 2016-05-25 10:12:50 -04:00
Diana Huang
677403192b Add accessibility tests for discussion forums. 2016-05-25 09:26:35 -04:00
Brian Jacobel
182921f1f1 Merge pull request #12433 from edx/bjacobel/upgrade-jquery 
Upgrade jQuery to 2.2
 2016-05-25 09:07:07 -04:00
Brian Jacobel
f4bede6c5b Fix library load paths (incl. jquery.scrollTo) 
Simplify paths in karma_cms_squire require paths
 2016-05-24 16:53:59 -04:00
Brian Jacobel
e433aa4e32 Remove this focus test, it's impossible to get it to pass in all envs without breaking something else 2016-05-24 16:53:58 -04:00
Brian Jacobel
ad2a9a985d .val is not working here, approximate its intent with .prop("checked") 2016-05-24 16:53:58 -04:00
Brian Jacobel
a893c00b20 Update to jquery-migrate 1.4.1 2016-05-24 16:53:57 -04:00