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

3988 Commits

Author SHA1 Message Date
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
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
cahrens
682ee5eac1 Rename helper method that was being run as a testpoint. 2016-07-25 16:17:40 -04:00
cahrens
d061b8ddbe Use request_cache for storing disabled xblock names. 
TNL-5002
 2016-07-25 16:17:30 -04:00
Nimisha Asthagiri
1ada5c3487 Create Grades djangoapp 
https://openedx.atlassian.net/browse/TNL-5008
 2016-07-22 00:09:43 -04:00
Renzo Lucioni
719edc7632 Merge pull request #13032 from edx/renzo/program-utility-cleanup 
Handle unavailable course runs on the program detail page
 2016-07-21 16:30:44 -04:00
Renzo Lucioni
4c997601e9 Handle unavailable course runs on the program detail page 
Includes a refactor of the program data extension utility. ECOM-4807.
 2016-07-21 15:05:23 -04:00
Kevin Kim
1ab52f8b0a Merge pull request #12945 from edx/kkim/ora_tz_date 
Convert ORA Due Dates
 2016-07-21 10:52:07 -04:00
Robert Raposa
67e15e22e6 Merge pull request #13046 from edx/release 
Release 2016-07-20 back to Master
 2016-07-21 10:43:58 -04:00
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Umar Nawaz
733cf06cd9 Merge pull request #13005 from edx/unawaz/ECOM-4787-account-settings-page-header 
unawaz/ECOM-4787-account-settings-page-header
 2016-07-21 01:13:32 +05:00
Renzo Lucioni
f0644abe3b Merge pull request #13033 from edx/renzo/handle-missing-catalog-config 
Allow program detail pages to function when catalog config is missing
 2016-07-20 15:46:59 -04:00
Renzo Lucioni
935be27118 Allow program detail pages to function when catalog config is missing 2016-07-20 14:19:08 -04:00
unawaz
5f8bb35f9d Account settings page 
unawaz/ECOM-4787-account-settings-page-header
 2016-07-20 20:18:53 +05:00
Simon Chen
1d768cde7a ECOM-4904 Move the program editor backbone app to Studio (#12962) 2016-07-19 19:09:51 -04:00
Renzo Lucioni
7ede26a117 Prevent program utilities from formatting dates prior to 1900 
ECOM-4973
 2016-07-18 16:22:51 -04:00
Renzo Lucioni
71739f3f44 Register CatalogIntegration model with the Django admin 2016-07-17 01:26:01 -04:00
Renzo Lucioni
a43c507a00 Use course run marketing URLs from the catalog service on program detail page 
Part of ECOM-4566.
 2016-07-15 16:12:10 -04:00
Renzo Lucioni
b1fcc51c7f Merge pull request #12965 from edx/renzo/catalog-config-model 
Add ConfigurationModel governing integration with the catalog service.
 2016-07-12 13:34:11 -04:00
Renzo Lucioni
191a353078 Add ConfigurationModel governing integration with the catalog service. 
This is the first in a series of commits that will retrieve and use data from the catalog API. Part of ECOM-4566.
 2016-07-11 14:47:55 -04:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code 
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
 2016-07-07 16:38:39 -04:00
Kevin Kim
0bf8fc4b44 Converts the dates on the dashboard, sidebar navigation, and important course dates to user specified time zone. 2016-07-05 17:45:13 +00:00
Saleem Latif
b89bb7e6b3 Merge pull request #12933 from edx/saleem-latif/fix-footer-test-failure 
Fix footer test failures
 2016-07-03 01:12:38 +05:00
Saleem Latif
5ccc80b42f Fix footer test failures 2016-07-03 00:11:45 +05:00
Renzo Lucioni
d738188550 Add upgrade section to program detail course cards. 
Displays a message and link when a user is enrolled in a program's course run but must upgrade in order to be eligible for the program certificate. ECOM-4220.
 2016-07-02 01:23:20 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
Jillian Vogel
e19fb06e9d Merge pull request #12582 from open-craft/feature/discussion_xblock 
Convert Discussion Module to XBlock
 2016-06-29 20:49:35 +12:00
Renzo Lucioni
5b4869cf02 Merge pull request #12887 from edx/renzo/program-details-date-format 
Make program details date formatting consistent with course dashboard
 2016-06-28 18:59:29 -04:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Renzo Lucioni
1b5a63a368 Make program details date formatting consistent with course dashboard 2016-06-28 13:18:28 -04:00
Kevin Kim
d0be769f1d Merge pull request #12667 from edx/kkim/tz_pref_AS 
Time Zone in Account Settings
 2016-06-28 13:10:10 -04:00
Simon Chen
4911bf805f ECOM-4219 - Add the course states to course cards and make sure the display follows course states (#12844) 
Please enter the commit message for your changes. Lines starting
 2016-06-28 12:57:25 -04:00
Kevin Kim
059985b9ec Added time zone field to user account settings, currently hidden behind a feature flag. 2016-06-28 14:33:56 +00:00
Sylvia Pearce
ce3da57546 Merge pull request #12783 from edx/sylvia/DOC-2361 
Account registration and activation text string revisions
 2016-06-27 15:01:36 -04:00
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Simon Chen
8ad34c08b1 ECOM-4804 Add the organization logo url to the program details page (#12862) 2016-06-27 12:44:11 -04:00
Renzo Lucioni
3ceba5622c Include link to shareable run mode certificate, when available. 
Part of ECOM-4224.
 2016-06-24 14:04:52 -04:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Nimisha Asthagiri
8513e823bc Add block_metadata_utils 2016-06-23 20:22:33 -04:00
Nimisha Asthagiri
57dde6516a Update ENABLED_CACHES values 2016-06-23 20:22:33 -04:00