Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4470 Commits

Author SHA1 Message Date
asadiqbal
2833d1e9a5 WL-603 load locale paths for themes directories 2016-09-22 13:26:11 +05:00
Michael Frey
c52ba6ac75 Revert "[SOL-1953] Update Commerce Configuration" 2016-09-21 15:33:02 -04:00
Saleem Latif
b3def09383 check settings.DEFAULT_SITE_THEME to be not None before applying default theme 2016-09-19 12:57:50 +05:00
Chris
23cc23bb9c Merge pull request #13386 from edx/clrux/ac-578-logistration-label-link 
AC-578 fixing link in label on logistration form
 2016-09-15 07:30:11 -04:00
Chris Rodriguez
2e3129fbd8 AC-578 fixing link in label on logistration form 2016-09-14 14:59:14 -04:00
Nimisha Asthagiri
5822919549 Cache Enrollment state for (user, course) in request cache. 2016-09-12 15:56:03 -04:00
Nimisha Asthagiri
f0f7a5389b Optimize Subsection computation 2016-09-09 13:57:51 -04:00
PaulWattenberger
b0885bd4a5 Merge pull request #13409 from edx/pwattenberger/sailthru_campaign_id 
Pass Sailthru campaign id cookie to ecommerce
 2016-09-08 13:32:05 -04:00
PaulWattenberger
7ec898298e Pass Sailthru campaign id cookie to ecommerce 2016-09-08 10:50:13 -04:00
Renzo Lucioni
948c1bd8ae Merge pull request #13408 from edx/renzo/display-catalog-micromasters 
Retrieve marketable MicroMasters from the catalog service
 2016-09-08 09:47:20 -04:00
Renzo Lucioni
37523939f2 Retrieve marketable MicroMasters from the catalog service 
Catalog-based MicroMasters need to be displayed in the LMS. However, the LMS currently retrieves all program data from the soon-to-be-retired programs service. Consuming program data exclusively from the catalog service is out of the question right now; it's too complex to confidently pull off in a week. This is a functional middle ground introduced by ECOM-5460. Cleaning up this debt is tracked by ECOM-4418.
 2016-09-07 17:44:54 -04:00
J. Cliff Dyer
1371739f45 Register block_structure djangoapp. 
TNL-5274
 2016-09-06 11:42:38 -04:00
Marko Jevtić
79421a2c94 Merge pull request #13299 from edx/mjevtic/SOL-1953 
[SOL-1953] Update Commerce Configuration
 2016-09-06 16:53:20 +02:00
Douglas Hall
43580bc573 Merge pull request #13358 from edx/saleem-latif/MAYN-207-transition-to-theming 
MAYN-207: Migrate WL sites to comprehensive theming for LMS
 2016-09-02 10:21:21 -04:00
Nimisha Asthagiri
b37d2d739a Make BlockStructure tasks more resilient against failures. 
https://openedx.atlassian.net/browse/TNL-5041
 2016-09-02 08:02:49 -04:00
Marko Jevtic
ab9c858b54 [SOL-1953] Update Commerce Configuration 2016-09-02 08:28:18 +00:00
Saleem Latif
f974347dcb Update theming to have priority over microsites. 2016-09-01 14:57:52 +05:00
Douglas Hall
f915befe93 Merge pull request #13359 from edx/release 
Merging rc/2016-08-31 into master
 2016-08-31 11:41:51 -04:00
Giovanni Di Milia
cc65094b03 Added Current Grade Rest API 2016-08-30 13:51:41 -04:00
Diana Huang
c9a8b59904 Fix spelling of permission. 2016-08-29 15:50:01 -04:00
hasnain naveed
72581a08ce WL-474 | theme boilerplate 2016-08-19 09:18:52 -04:00
Tim Krones
98a03f68e8 Merge pull request #13194 from open-craft/mtyaka/hide-instructor-tools 
Hide 'Reset Attempts' and 'Rescore Problem' on unsupported blocks.
 2016-08-16 19:00:01 +02:00
Awais Jibran
72549cf366 Merge pull request #13185 from edx/aj/ECOM5081-hide-credit-btn 
Hide credit button from  audit track students
 2016-08-12 11:53:40 +05:00
Awais Jibran
511de4c606 Hide credit button from audit track students 
ECOM-5081
 2016-08-11 23:20:01 +05:00
Renzo Lucioni
363f9e2cd5 Merge pull request #13170 from edx/renzo/dashboard-programs 
Display programs of all categories on the student dashboard
 2016-08-11 10:06:15 -04:00
Kevin Kim
635c044332 Merge pull request #13140 from edx/kkim/country_tz_pref 
Time Zone Field Changes Based on Country
 2016-08-11 09:15:08 -04:00
Renzo Lucioni
9c81ba47e2 Display programs from all categories on the student dashboard 
Removes most remaining hardcoded references to XSeries from the LMS. Part of ECOM-4638.
 2016-08-11 09:00:23 -04:00
Kevin Kim
3af769b4ad Update time zone dropdown in account settings based on user country 2016-08-10 19:15:52 +00:00
cahrens
9d8611374f Silence expected IntegrityErrors. 
TNL-5181
 2016-08-09 21:44:39 -04:00
Matjaz Gregoric
0dd0f1f81d Hide 'Reset Attempts' and 'Rescore Problem' on unsupported blocks. 
CAPA problems have the "Staff Debug Info" button, which allows
instructors to "Reset Attempts" and "Rescore problem" for any individual
student.

XBlocks, such as Drag and Drop v2 do not support those, though the UI
was still present. Clicking any of those links would result in an
"Unknown Error Occurred" message.

This commit hides the two buttons if the associated block does not
support them.
 2016-08-09 16:28:11 +08:00
Eric Fischer
3ba09221c1 Add Logging for CohortMembership 2016-08-05 22:15:50 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Ned Batchelder
ecffdacf5a Silence needless pylint warnings 2016-08-03 12:44:41 -04:00
Ned Batchelder
8571ceabeb Fix many wrong-assert-type errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
eef964f5f6 Fix unused-variable errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
e3cd261e99 Fix 2 unnecessary-pass errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Ned Batchelder
9e6a63b68e Fix translation-of-non-string errors 2016-08-03 12:44:41 -04:00
Renzo Lucioni
c5434c5310 Merge pull request #13125 from edx/renzo/multiple-program-types 
Allow program listing page to display programs from any category
 2016-08-02 13:11:23 -04:00
Renzo Lucioni
8196e1a024 Allow program listing page to display programs from any category 
This work removes most references to XSeries from the LMS in an attempt to be more general. ECOM-5018.
 2016-08-01 16:47:21 -04:00
Saleem Latif
cff28539aa Update configuration helpers to take into account microsite configurations 2016-08-01 18:45:08 +05:00
Kevin Kim
3a65ca02fe Merge pull request #13023 from edx/kkim/country_tz_api 
Country Time Zone API
 2016-07-28 16:28:47 -04:00
Kevin Kim
127095b94a Add endpoint for commonly used country time zones 2016-07-28 19:02:55 +00:00
cahrens
c195e7eb72 There is no need to call save after add/remove. 2016-07-27 16:15:16 -04:00
Renzo Lucioni
92f3c7ee60 Merge pull request #13112 from edx/release 
Release
 2016-07-27 12:33:49 -04:00
Kevin Kim
a39d6c2e94 Add gated content banner for staff in lms 2016-07-27 14:03:08 +00:00
Saleem Latif
6277bd27e6 Remove all usages of USE_CUSTOM_THEME and THEME_NAME from python files 2016-07-27 14:53:02 +05:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming 
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
 2016-07-27 13:55:14 +05:00
Renzo Lucioni
b540968457 Updates to facilitate program category casing changes 
The LMS continues to expect lowercased category slugs, while the Studio program creator now uses correctly cased slugs. Programs should be updated before this is released. Part of ECOM-5018.
 2016-07-26 16:28:41 -04:00