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

37192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Chen
928e4b46a0 ECOM-4218 Draft 2 to add course card styles (#12593) 
ECOM-4218 Draft 2 to add course card styles
 2016-06-01 16:42:03 -04:00
Renzo Lucioni
3552457375 Merge pull request #12614 from edx/renzo/prevent-catalog-caching 
Prevent dumpdata from dumping api_admin's Catalog model
 2016-06-01 15:31:45 -04:00
AlasdairSwan
a7d036f912 Merge pull request #12613 from edx/release 
Release 1st June 2016
 2016-06-01 15:22:19 -04:00
Douglas Hall
16bf044eee Merge pull request #12612 from edx/douglashall/OSPR-1272/upgrade_lti_consumer 
OSPR-1272 Upgrading xblock-lti-consumer to v1.0.7
 2016-06-01 14:56:55 -04:00
Renzo Lucioni
835c9cc957 Prevent dumpdata from dumping api_admin's Catalog model 
The Catalog model is unmanaged, meaning no corresponding table exists in the database. When dumpdata tries to dump this model, it chokes because there's no table to read from.
 2016-06-01 14:21:00 -04:00
AlasdairSwan
81d2c75d6b Merge pull request #12576 from edx/rc/2016-05-31 
Release Candidate rc/2016-05-31
 2016-06-01 13:44:32 -04:00
Douglas Hall
0d49527607 Upgrading xblock-lti-consumer to v1.0.7 2016-06-01 13:41:57 -04:00
Sofiya Semenova
7fa763b29f Merge pull request #12579 from edx/christina/icons 
Christina/icons
 2016-06-01 09:26:35 -04:00
Matt Drayer
6bac7c49bf Merge pull request #12603 from edx/mattdrayer/determine-correct-checkout 
mattdrayer/determine-correct-checkout: Select proper checkout workflow based on context
 2016-06-01 09:23:14 -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
Matt Drayer
42af66cee7 mattdrayer/determine-correct-checkout: Select proper checkout workflow based on context 2016-06-01 00:39:15 -04: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
Tasawer Nawaz
454368bbc2 Merge pull request #12594 from edx/revert-ecom-4334-update-learner-dashboard 
Revert "ECOM-4334 Update learner dashboard"
 2016-06-01 02:03:05 +08:00
Mushtaq Ali
005bee8fbe Make templates safer 2016-05-31 21:58:05 +05:00
Peter Fogg
62aca484fd Merge pull request #12592 from edx/peter-fogg/cookies-again 
https://github.com/edx/edx-platform/pull/12588, round 2!
 2016-05-31 12:20:12 -04: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
Peter Fogg
f7d002e65e Change user attribute for cookies to a constant value. 2016-05-31 11:23:51 -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
Chris Rodriguez
f64bf4c081 Revert "AC-454 adding visual clarify for selected menu options" 
This reverts commit 4175616519.
 2016-05-31 10:43:44 -04:00
Fred Smith
ef213488b9 Merge pull request #12590 from edx/derf/SES_should_use_the_non-smtp_endpoint 
SES should use the non-smtp endpoint
 2016-05-31 10:36:30 -04:00
tasawernawaz
feb8ca4467 Revert "ECOM-4334 Update learner dashboard" 
This reverts commit caa5a0ac02.
 2016-05-31 14:36:19 +00:00
Brian Jacobel
a799da96f1 This file is empty and hasn't been touched since 2012 2016-05-31 10:27:13 -04:00
Fred Smith
d7af2f119d SES should use the non-smtp endpoint 2016-05-31 09:46:20 -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