Commit Graph

3076 Commits

Author SHA1 Message Date
Ned Batchelder
537dd040c8 Merge pull request #12117 from edx/ned/fix-mako-encoding
Fix encoding of Django-called Mako files to be safe
2016-04-12 14:21:12 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198
ECOM-3198 Add banner image to the program listing program cards
2016-04-11 16:00:03 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Ned Batchelder
4f9f87c192 Fix encoding of Django-called Mako files to be safe
The old code set the output-encoding to None, which means, I want
Unicode strings as output.  This made Mako pass markupsafe objects to
"unicode()", which applied all the escaping.  Then the result would be
given to Django, would would html-escape it again, resulting in
over-escaping.

By setting the output-encoding to utf8, we use filters.encode.utf8
instead, which is aware of Markupsafe, which avoids the over-escaping.
2016-04-11 14:00:15 -04:00
Andy Armstrong
9290c52b33 Introduce Pattern Library test pages (take two)
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

This is the second attempt to enable the Pattern Library. The
first attempt broke Django Templates and didn't work correctly
with right-to-left styling.
2016-04-11 00:45:31 -04:00
Brian Jacobel
4671970f86 Revert "Introduce Pattern Library test pages"
This reverts commit 845e3708f3.
2016-04-08 14:25:41 -04:00
Ned Batchelder
2e1238b83e Remove unused imports 2016-04-08 11:23:05 -04:00
Adam Palay
76f0fb0fc2 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-04-07 12:02:43 -04:00
muzaffaryousaf
c3cd2db384 Moving choices to admin form instead of models.
TNL-4296
2016-04-07 12:26:18 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
muzaffaryousaf
90c670c0ac Unit test to check the migrations are in sync. 2016-04-07 12:26:17 +05:00
Ben Patterson
c9e4a1d964 Revert "Disallow free verified course modes" 2016-04-06 13:58:41 -04:00
Awais Jibran
03925474b9 Verification Upgrade Deadline panel on course home page should not show if user is already verified 2016-04-06 12:53:31 -04:00
Braden MacDonald
60f4f1ac77 Enable Azure AD third party auth provider by default 2016-04-06 12:51:22 -04:00
Omar Khan
07892a75f2 Custom icons for third party auth login buttons
- Icon images can be uploaded from the django admin
- Test coverage improved
2016-04-06 12:50:55 -04:00
Simon Chen
e0995b8072 Merge pull request #11374 from open-craft/omar/verified-coursemode-price
Disallow free verified course modes
2016-04-06 12:32:00 -04:00
Toby Lawrence
fc149abf06 Merge pull request #12007 from edx/PERF-274
[PERF-274] Add NewRelic instrumentation to contentserver.
2016-04-06 11:43:08 -04:00
Toby Lawrence
09586d8a37 [PERF-274] Add NewRelic instrumentation to contentserver.
This includes the course key/path for a given contentserver request,
whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests are
coming into the contentserver to figure out whether or use of a CDN in
front of these assets is as efficient as effective as it could be.
2016-04-06 10:31:02 -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
John Eskew
33568cb409 Merge pull request #11988 from mitocw/fix/aq/cas_profile_not_found_mitocw#102
Fixed 500 error in case of user's profile not found when login/logout with CAS.
2016-04-05 15:31:48 -04:00
Amir Qayyum Khan
9220c4d8dd Fixed 500 error in case of user's profile not found when login/logout with CAS 2016-04-05 22:49:05 +05:00
Amir Qayyum Khan
58bde7f301 Excluded admins, staff and coach of master course from max enrollment 2016-04-05 21:31:54 +05: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
Nimisha Asthagiri
f5ad6aaddb Merge pull request #11506 from openfun/openfun/translate_user_languages_in_account_settings
Translate preferred languages in user account settings
2016-04-04 09:31:35 -04:00
Régis Behmo
d2317be682 Translate available preferred languages in user account settings
The listed languages in the "preferred languages" input dropdown should
be translated in the user language.
2016-04-04 10:33:00 +02:00
Jonathan Piacenti
17ec12c650 Address platform final review notes. 2016-04-01 21:06:07 +00:00
Jonathan Piacenti
61c76771f8 Add completion and enrollment badges. 2016-04-01 10:13:08 -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
Nimisha Asthagiri
0c604da9ee Merge pull request #11900 from edx/nasthagiri/css-template
XSS Safe by default: dashboard, header, footer, navigation, help_modal
2016-03-31 17:25:30 -04:00
Nimisha Asthagiri
6eec5ac472 XSS Safe Default - dashboard 2016-03-31 16:33:17 -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
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
Tasawer
05898df1c1 updated dashboard with providers text
ECOM-2935
2016-03-29 09:26:35 +00: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
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
Toby Lawrence
1af28cefe8 Revert "Only require a module once."
This reverts commit 76c0c0413d.
2016-03-25 13:22:36 -04:00
Simon Chen
d15e192b26 Fix to remove mulitple page tags on mako templates 2016-03-25 09:56:23 -04:00
Toby Lawrence
76c0c0413d Only require a module once.
Looking at this code, I'm not entirely sure why it was added, but it's
demonstrably loading modules twice when not in debug mode.
2016-03-23 12:29:47 -04:00
M. Rehan
8459b5be77 Merge pull request #10705 from edx/mrehan/SUST-22
Implement 'from_string_or_404' in utils
2016-03-23 21:26:39 +05:00
Muhammad Rehan
771a7d06ca Implement 'from_string_or_404' util and its example usage. 2016-03-23 20:10:32 +05: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
vkaracic
3c8ae7c3b2 Change EcommerceService's is_enabled to accept User instead of request
. And change the verification link in the sidebar to redirect to new basket if the EcommerceService is enabled.
2016-03-23 07:44:55 +00:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
This reverts commit 954dae584a.
2016-03-16 11:19:36 -04:00
Zia Fazal
954dae584a ziafazal/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
2016-03-14 13:42:53 -04:00
John Eskew
2c78813380 Merge pull request #11768 from edx/jeskew/upgrade_to_django_1_8_11
Upgrade to Django 1.8.11.
2016-03-10 11:31:51 -05:00
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination
Notes pagination
2016-03-10 17:26:54 +05:00
Peter Fogg
91fd6dbea2 Merge pull request #11769 from edx/peter-fogg/disable-order-closed-course
Prevent ordering closed courses, and give a good user message.
2016-03-08 20:32:25 -05:00