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

37183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Jacobel
dfd684ffd0 One more instance of require_module outside block js_extra 2016-06-01 16:11:19 -04:00
Brian Jacobel
47bc8e65f3 Fix actual safe template violations 2016-06-01 12:53:21 -04:00
Brian Jacobel
7c7ab81531 Add require_module_async to safe template linter js context trigger 2016-06-01 12:07:17 -04:00
Brian Jacobel
2e4ad45bb0 Make require_module_async call require_module 2016-06-01 12:07:17 -04:00
Brian Jacobel
c281586a29 Fix other usages of require_module outside <%block name="js-extra" 2016-06-01 12:07:17 -04:00
Brian Jacobel
d9c798dca3 Fix JS load order issues for edxnotes 2016-06-01 12:07:17 -04:00
Brian Jacobel
6135323427 Load factory JS files with a synchronous <script> tag in production 2016-06-01 12:07:17 -04:00
Sofiya Semenova
7fa763b29f Merge pull request #12579 from edx/christina/icons 
Christina/icons
 2016-06-01 09:26:35 -04:00
Mushtaq Ali
89a16a41e4 Merge pull request #12042 from edx/mushtaq/safe-templates 
Make templates safer
 2016-06-01 12:37:37 +05:00
Clinton Blackburn
8ea3b62016 Added admin for UserAttribute model (#12596) 
ECOM-4502
 2016-05-31 18:22:18 -04:00
Clinton Blackburn
2fd9896ca1 Allowing profile image upload date to be blank (#12601) 2016-05-31 16:46:11 -04:00
ssemenova
36c867c42a changed icon html from <i> to <span> 
TNL-4651
 2016-05-31 15:46:23 -04:00
Andy Armstrong
42f44848e5 Merge pull request #12585 from edx/andya/course-navigation-safe-template 
Refactor staff preview menu logic out of template
 2016-05-31 14:05:24 -04:00
Mushtaq Ali
005bee8fbe Make templates safer 2016-05-31 21:58:05 +05:00
Brian Jacobel
53d31551f6 Merge pull request #12591 from edx/bjacobel/forgot_password_empty 
File doesn't do anything
 2016-05-31 11:39:05 -04:00
Andy Armstrong
7ee41eafb3 Refactor staff preview menu logic out of template 2016-05-31 11:36:40 -04:00
Christina Roberts
98fcc4ff9e Merge pull request #12578 from edx/christina/tnl-4561 
Christina/tnl 4561
 2016-05-31 11:06:48 -04:00
Brian Jacobel
a799da96f1 This file is empty and hasn't been touched since 2012 2016-05-31 10:27:13 -04:00
Christina Roberts
880206e438 Merge pull request #12577 from edx/christina/4642 
Add missing file.
 2016-05-31 08:48:40 -04:00
cahrens
3aa7a313fc Move file to common directory. 
It is needed by both Studio and LMS.
TNL-4642

x
 2016-05-30 12:43:46 -04:00
Ehtesham Kafeel
9cb660a7d2 Merge pull request #12410 from edx/fedx/upgrade-paging-collection 
Upgrade edx-platform's paging collection with new edx-ui-toolkit's paging collection
 2016-05-30 17:44:57 +05:00
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
Ehtesham
b31ba9d041 upgrade Pagingcollection to edx-ui-toolkit's PagingCollection 2016-05-27 04:35:44 +05: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