Commit Graph

3531 Commits

Author SHA1 Message Date
Clinton Blackburn
d2d38f9b2c Stripping auth querystring from S3 URLs
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
2016-04-07 17:14:18 -04:00
Amir Qayyum Khan
60b368e22b Fixed unable to created ccx even if ccx_conn url is not set 2016-04-07 19:30:17 +05:00
Jim Abramson
e0ca1ecaef remove unused CERTIFICATES_ENABLED feature flag
ECOM-4040
2016-04-06 17:53:40 -04:00
Andy Armstrong
34cecaee77 Merge pull request #11957 from edx/andya/pattern-library-test-page
Introduce Pattern Library test pages
2016-04-05 15:36:11 -04:00
Andy Armstrong
845e3708f3 Introduce Pattern Library test pages
FEDX-93

These are developer only pages, so can not be seen in production
environment. On devstack, you can access these pages in LMS and
Studio at:

    /template/ux/reference/pattern-library-test.html
2016-04-05 09:22:14 -04:00
Renzo Lucioni
3cce6c1e46 Merge pull request #12034 from edx/renzo/discussion-topics
Fix discussion category map for self-paced courses
2016-04-05 08:29:49 -04:00
Peter Fogg
d86aff2866 Merge pull request #11982 from edx/peter-fogg/create-api-request
Request API access.
2016-04-04 22:56:49 -04:00
Renzo Lucioni
0e7247f2a7 Fix discussion category map for self-paced courses
Prevents start date alone from being used to filter out categories in self-paced courses during construction of the category map. ECOM-4017.
2016-04-04 21:15:26 -04:00
Peter Fogg
b340c2fd9c Allow users to request access to the Course Discovery API.
ECOM-3940
2016-04-04 20:29:19 -04:00
Brian Jacobel
24990272b1 Do not set up underscore.string globally. 2016-04-04 10:18:44 -04:00
Ned Batchelder
f10a3c968e Merge pull request #12020 from edx/ned/fix-doc-links
Fix links to moved sections of the developer guide
2016-04-04 06:43:30 -04:00
Kelketek
ab0cbfffeb Merge pull request #10556 from edx/feature/badges-v2
Badges V2 Feature Branch
2016-04-01 17:06:26 -05:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Ned Batchelder
d47f872ab7 Fix links to moved sections of the developer guide 2016-04-01 15:33:24 -04:00
Jonathan Piacenti
a04a635efc Add accomplishments to user profile 2016-04-01 10:13:08 -05:00
Jonathan Piacenti
112a143589 Refactor badging, move into its own app. 2016-04-01 10:13:08 -05:00
muzaffaryousaf
ce142eb378 Removing check for edx notes for OAUTH token timeout.
TNL-4336
2016-04-01 20:01:46 +05:00
Cliff Dyer
6917eb03cf Merge pull request #12009 from edx/merge-release-into-master
Merge oauth release into master via intermediary branch
2016-04-01 06:12:16 -04:00
Omar Khan
793bb0f1e9 Custom icons for third party auth login buttons
- Icon images can be uploaded from the django admin
- Test coverage improved
2016-04-01 08:57:43 +07:00
Sanford Student
53e6611fc8 removing feature flag for next button across sections 2016-03-31 16:50:48 -04:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00:00
Simon Chen
21be72048a Create the listing page of Programs (x-series) which learners have enrolled in 2016-03-31 15:35:50 -04:00
Braden MacDonald
374ab7d1ec Merge pull request #11984 from open-craft/enable-azuread-default
Enable Azure AD third party auth provider by default
2016-03-31 08:52:09 -07:00
Diana Huang
ced32800a6 Add new djangoapp that allows for configuration of
Verified Track Cohorts through the admin interface.
2016-03-31 09:45:22 -04:00
Saleem Latif
7b549bc354 Merge pull request #11806 from edx/saleem-latif/WL-327
WL-327: Add SiteConfiguration and SiteConfigurationHistory models to LMS
2016-03-31 18:39:38 +05:00
Saleem Latif
d7f781db20 Add SiteConfiguration configuration model to LMS 2016-03-31 12:46:42 +05:00
jsa
52657af81d add edx-management-commands dependency. 2016-03-30 14:59:09 -04:00
Andy Armstrong
2a204f7ffa Add static HtmlUtils/StringUtils into edx namespace
This is a temporary workaround for code that needs
access to these classes from the UI Toolkit but
without using RequireJS.
2016-03-30 10:30:39 -04:00
J. Cliff Dyer
1df040228a Configure LMS to select oauth2 providing library.
Available backends:

* django-oauth-toolkit (DOT)
* django-oauth2-provider (DOP)

* Use provided client ID to select backend for
  * AccessToken requests
  * third party auth-token exchange
* Create adapters to isolate library-dependent functionality
* Handle django-oauth-toolkit tokens in edX DRF authenticator class

MA-1998
MA-2000
2016-03-30 14:21:27 +00:00
J. Cliff Dyer
88fef8b2a4 Use renamed edx_oauth2_provider throughout.
MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
2016-03-30 14:21:17 +00:00
Braden MacDonald
ee444ed67f Enable Azure AD third party auth provider by default 2016-03-29 15:24:00 -07:00
Nimisha Asthagiri
74a9989f04 Merge pull request #11705 from edx/tnl/next_button
Activate LMS Navigation Button across sections
2016-03-29 15:05:59 -04:00
Nimisha Asthagiri
8cbf99aca4 Activate Next and Previous Buttons across sections
MA-2152
MA-2153
2016-03-29 12:58:08 -04:00
Matt Drayer
ed0c26160b Merge pull request #11885 from edx/saleem-latif/WL-328
WL-325: Multi-Site Comprehensive Theming
2016-03-28 16:23:34 -04:00
Zia Fazal
a796b56314 saleem-latif/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
saleem-latif: Update Theme storages to work with Caching, Pipeline and collectstatic
saleem-latif: Incorporate feedback changes
mattdrayer: Pylint violation fix
mattdrayer: Fix broken pavelib test
2016-03-28 14:57:01 -04:00
Peter Fogg
374e97c15f Admin access for API requests.
ECOM-3943
2016-03-28 11:42:42 -04:00
Toby Lawrence
90f41ed2cb Merge pull request #11878 from edx/PERF-279
Use a module/path mapping for RequireJS overrides instead of just paths.
2016-03-25 14:45:07 -04:00
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
2016-03-25 10:02:38 -04:00
Muzaffar yousaf
73c97f4d75 Merge pull request #11935 from edx/mzfr/rqst-timeout-tnl2444
Setting request timeouts for edx notes.
2016-03-25 18:42:16 +05:00
muzaffaryousaf
1ecba9a954 Setting request timeouts for edx notes.
TNL-2444
2016-03-25 16:26:35 +05:00
Toby Lawrence
5758a82665 Syntax error. 2016-03-24 11:44:01 -04:00
Toby Lawrence
2a87d6c8a5 Add straggler JS files to RequireJS overrides. 2016-03-24 11:35:48 -04:00
Usman Khalid
78016db313 Merge pull request #11932 from edx/release
Merge release to master
2016-03-24 16:58:12 +05:00
Toby Lawrence
e62a8da457 Set the correct names for overridden dependencies. 2016-03-23 11:28:25 -04:00
Toby Lawrence
f8ddfb5945 Use a module/path mapping for RequireJS overrides instead of just paths.
Instead of attempting to derive the module portion of a RequireJS
override strictly from the path to the JS file, we now use a dictionary
where the module name must be explicitly specified.  This allows us to
compensate for files which do not follow a naming scheme that is
compatible with RequireJS without having to normalize all files.  This
is extremely important when using third-party dependencies.
2016-03-23 10:34:58 -04:00
Ehtesham
5ad2eb300c [TNL-4073][TNL-4273] Make sure that domain defined for preview exists in
HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS,
2016-03-23 18:52:32 +05:00
Christina Roberts
4626746678 Merge pull request #11844 from edx/christina/delete-carousel
Delete face_upload and responsive-carousel.
2016-03-21 13:26:04 -04:00
Renzo Lucioni
a5b10ca0fe Merge pull request #11805 from edx/renzo/self-paced-modulestore-wrapper
Override field data within the XBlock runtime
2016-03-21 12:14:22 -04:00
Renzo Lucioni
cd9986b662 Override field data within the XBlock runtime
Resolves an issue preventing students in self-paced courses from seeing all available discussion modules. ECOM-3733.
2016-03-18 17:15:00 -04:00
cahrens
f9901614f1 Delete face_upload and responsive-carousel.
This appears to be dead code.
2016-03-17 15:14:19 -04:00