Commit Graph

207 Commits

Author SHA1 Message Date
Ned Batchelder
09690ce667 Correct the trademark notices
* edX should be lowercase everywhere

* Studio is not a trademark

* Our trademarks are all registered trademarks
2019-05-16 06:16:51 -04:00
Christopher Pappas
4c5ca6d086 ENT-1887 | Adding logic for new business marketing footer url construction, while maintaining backwards compatibility
Fixing quality test

Testsing out a default value for the sake of jenkins tests. will revert

Fix footer test from being flaky

Moving an import statement

ran isort. adding a test. fixing 1 quality issue

Quality cleanups

Attempting more quality fixes

adding back in config variable name for default value

Adding ENTERPRISE_MARKETING_FOOTER_QUERY_PARAMS to common settings

Changing marketing_url logic to only concatenate enterprise url to root if the enterprise url is relative (starts with a /)

quality fixes
2019-05-09 17:15:47 -04:00
Jeremy Bowman
5eac6aa049 Upgrade to django-pipeline 1.6.14 (#20449) 2019-05-07 16:01:37 -04:00
Mike Dikan
2c149ca6be Removing the Deprecated the 'external_auth' package in favor of 'third_party_auth' which is the current recommendation. 2019-03-02 16:06:46 -05:00
David Ormsbee
3f82a279c9 Merge pull request #19315 from open-craft/giovanni/bb-548-ospr
OSPR-2818 - Add Contact Us form customization options (BB-548)
2019-02-27 20:36:23 -05:00
Calen Pennington
78c8950ea3 Clean up a few remaining unicode format string errors 2019-02-20 15:28:14 -05:00
Julia Eskew
368f221f0a Initial start on annotations. 2019-02-19 11:24:21 -05:00
Giovanni Cimolin da Silva
650aad6ce5 Add Contact Us form customization options
This commit adds personalization options for the Contact Us links on 
edx-platform's
page.
To allow for this customization, two SiteConfiguration variables were 
added:
* CONTACT_US_ENABLE: Switch to enable/disable the Contact Us page. 
Setting this to
False will disable the contact page and the links on the footer will 
disappear.

* CONTACT_US_CUSTOM_LINK: If the contact page is enabled, this setting 
allows to set
a custom URL for the Contact Us links on edx-platform. If this setting 
is not set,
the platform will use the default contact form.
2019-02-13 18:17:45 -02:00
uzairr
4d0315c5f3 Remove links from spanish footer
It is a follow-up PR of the work that is already done for
removing specific links on footer.It is created because
two links are still appearing on spanish footer that need
not to be appeared on it.

LEARNER-6981
2019-02-13 15:24:57 +05:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
uzairr
c477dca533 Remove un-translated page links from spanish website's footer
Currently, spanish website's main page has links in footer whose
pages are still un-translated.In this PR, links of them are
removed so that user-experience should be improved.

LEARNER-6981
2019-02-11 22:20:06 +05:00
Calen Pennington
829227ade3 Merge pull request #19663 from cpennington/fbe-improve-course-api-performance
Fbe improve course api performance
2019-02-06 11:01:25 -05:00
Calen Pennington
6c596f7c49 Allow courses api to return data incrementally
Prior to this commit, the course api (/api/courses/v1/courses/)
performed all the work necessary to return all courses available
to the user, and then only actually returned on page's worth of those
courses.

With this change, the api now does the work incrementally, computing
only the data needed to fetch the courses up to and including the page
being returned. This still increases approximately linearly as
the page number accessed being increases, but should be more cache-friendly.
One side effect of this is that the max_page reported by pagination
will be an overestimate (it will include pages that are removed due
to a users access restrictions).

This change also changes the sort-order of courses being returned by the
course_api. By sorting by course-id, rather than course-number, we
can sort in the database, rather than in Python, and defer loading data
from the end of the list until it is requested.

REVMI-90
2019-02-06 10:11:15 -05:00
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -05:00
Calen Pennington
805f32a357 Revert "Allow courses api to return data incrementally" 2019-01-25 12:56:57 -05:00
Calen Pennington
a3541d6e46 Allow courses api to return data incrementally
Prior to this commit, the course api (/api/courses/v1/courses/)
performed all the work necessary to return all courses available
to the user, and then only actually returned on page's worth of those
courses.

With this change, the api now does the work incrementally, computing
only the data needed to fetch the courses up to and including the page
being returned. This still increases approximately linearly as
the page number accessed being increases, but should be more cache-friendly.
One side effect of this is that the max_page reported by pagination
will be an overestimate (it will include pages that are removed due
to a users access restrictions).

This change also changes the sort-order of courses being returned by the
course_api. By sorting by course-id, rather than course-number, we
can sort in the database, rather than in Python, and defer loading data
from the end of the list until it is requested.

REVMI-90
2019-01-25 10:30:09 -05:00
Michael Youngstrom
bc1d883e1a Dont let DarkLangConfig cache interfere with other tests 2018-09-06 10:33:54 -04:00
noraiz-anwar
22a6b08bda set x_frame_option to deny in lms common env 2018-08-07 16:42:02 +05:00
Jeremy Bowman
ca3316962d TE-2524 Stop using nose.plugins - LMS 1 2018-07-31 13:03:18 -04:00
Eric Fischer
247bb50ed2 s/django.core.urlresolvers/django.urls/g
Django 1.10 deprecation fix for Hackathon XIX
Addresses PLAT-1397
2018-06-05 13:59:09 -04:00
Stuart Young
1fd2167144 rebalance python unittests onto new shards 2018-05-03 11:16:05 -04:00
Eric Fischer
e18448e27d Silence deprecation warnings
https://docs.djangoproject.com/en/1.11/releases/1.10/#using-user-is-authenticated-and-user-is-anonymous-as-methods
2018-05-02 10:03:50 -04:00
Hamza Munir
0fc0f82256 Changing the contact-us link
Redirection to the newly created support form. If the server is production
it will take to production support form otherwise it will be forwarded to
Stage server support form.

LEARNER-4873
2018-04-24 14:13:23 +05:00
bmedx
634234966a WIP: Refactor registration to improve reliability 2018-04-05 15:11:41 -04:00
Hamza Munir
90f674e358 Footer Chinese Language Dupluication Issue
Removed the duplicate footer ICP LICENSE.

LEARNER-4766
2018-03-27 19:19:37 +05:00
Hamza Munir
a69ecd83d5 Footer Design Implementation without using bootstrap WIP
The New footer design implementation without using bootstrap. Using flexbox
creating new classes to assign different widths in different screen breakpoints.

LEARNER-2312
2018-03-23 02:37:59 +05:00
Hamza Munir
a5e0989021 Footer Bootstrap new design fixes WIP
Fixes for new design as per instruction in this ticket.

LEARNER-3131
2018-02-16 13:12:11 +05:00
Tasawer Nawaz
ab744a2516 update link of "Contact" in lms footer to lead new support form
LEARNER-4041
2018-01-31 17:53:52 +05:00
bmedx
1d45c85135 Refactor student login for readability and fix Django 1.11 issues 2018-01-24 11:26:43 -05:00
Jeremy Bowman
da8cf6b528 PLAT-1382 Populate ALLOWED_HOSTS for tests 2017-12-05 14:22:30 -05:00
Jeremy Bowman
103c723c6d PLAT-1801 Preserve new user login behavior under Django 1.10+ 2017-12-05 10:20:25 -05:00
bmedx
5fbbf4979a Tag LMS Unit 1 tests that fail in Django 1.11 2017-11-22 15:46:45 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
bmedx
11a4030767 LMS urls cleanup for Django 1.11
- Remove usage of django.urls.patterns
- Change urls tuples to lists
- Make all string view names callables
- This is the second of several urls updates for LMS; a work in progress
2017-11-06 16:06:00 -05:00
Hamza Munir
4a3164e2e3 Footer New design using bootstrap
This is a work in progress finished the 320px - 539px mobile
screen design.

LEARNER-2311
2017-10-30 14:55:26 +05:00
Waheed Ahmed
c56f72878e Fix edX logo links to home page instead of dashboard.
When you are on the Dashboard, or on any page in courseware, the logo
in the Header links to dashboard and the logo in the footer links
to edX home page.

LEARNER-2881
2017-10-20 14:49:06 +05:00
John Eskew
02f26f55ce Remove unused imports. Push model imports down into relevant methods.
Mock out the static_replace modules in the proper location.
2017-10-05 11:12:52 -04:00
Hasnain
bb33a3aa25 LEARNER-1146 | Removed the flag and their corresponding code. 2017-08-23 14:58:47 +05:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
Afzal Wali
b8a310d54b Put the program_types filter under the waffle switch 2017-07-06 13:12:43 -04:00
Afzal Wali
383208c4c8 multitenant Program cache.
Fetched Programs and Program details from Course Discovery service for all sites and stored the uuids in cache with site-specfic keys.
Learner-1146
2017-07-04 14:20:55 +05:00
Ned Batchelder
01018ec418 Correct spelling of 'Open edX', and pedantic typography in the copyright footer 2017-06-29 10:22:38 -04:00
Ned Batchelder
6adca0ff11 Add a link to edx.org in the default Open edX footer 2017-06-20 10:18:54 -04:00
Andy Armstrong
79acb5c5be Reorder LMS imports using isort 2017-06-11 21:48:06 -04:00
Anthony Mangano
70d8c5c22c update footer endpoint in branding api to support inclusion of language selector 2017-05-17 12:33:00 -04:00
Calen Pennington
03b23da980 Support fallback to supported language variants in the footer 2017-05-15 07:36:38 -04:00
David Ormsbee
2051c90924 Test Speedup: Isolate Modulestore Signals
There are a number of Django Signals that are on the modulestore's
SignalHandler class, such as SignalHandler.course_published. These
signals can trigger very expensive processes to occur, such as course
overview or block structures generation. Most of the time, the test
author doesn't care about these side-effects.

This commit does a few things:

* Converts the signals on SignalHandler to be instances of a new
  SwitchedSignal class, that allows signal sending to be disabled.

* Creates a SignalIsolationMixin helper similar in spirit to the
  CacheIsolationMixin, and adds it to the ModuleStoreIsolationMixin
  (and thus to ModuleStoreTestCase and SharedModuleStoreTestCase).

* Converts our various tests to use this new mechanism. In some cases,
  this means adjusting query counts downwards because they no longer
  have to account for publishing listener actions.

Modulestore generated signals are now muted by default during test runs.
Calls to send() them will result in no-ops. You can choose to enable
specific signals for a given subclass of ModuleStoreTestCase or
SharedModuleStoreTestCase by specifying an ENABLED_SIGNALS class
attribute, like the following example:

    from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase

    class MyPublishTestCase(ModuleStoreTestCase):
        ENABLED_SIGNALS = ['course_published', 'pre_publish']

You should take great care when disabling signals outside of a
ModuleStoreTestCase or SharedModuleStoreTestCase, since they can leak
out into other tests. Be sure to always clean up, and never disable
signals outside of testing. Because signals are essentially process
globals, it can have a lot of unpleasant side-effects if we start
mucking around with them during live requests.

Overall, this change has cut the total test execution time for
edx-platform by a bit over a third, though we still spend a lot in
pre-test setup during our test builds.

[PERF-413]
2017-02-23 10:31:16 -05:00
Douglas Hall
3055f9b259 Merge pull request #14339 from edx/hasnain-naveed/program-backend/WL-912
WL-766 Program marketing page data layer
2017-02-14 04:53:53 -05:00
Hasnain
41f3bba058 Backend code for program detail page.
This adds functions to the catalog utils which munge data
collected from the program endpoint and LMS database to construct
data structures that are ready for use by view and templates
related to the Open EdX marketing pages that live in LMS.

WL-766
2017-02-13 20:37:56 -05:00
Douglas Hall
58f0154ee2 Add support for multi-org sites
WL-926
2017-02-13 19:33:47 -05:00