Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,357 Commits 1 Branch 0 Tags
ab8bcccd01ac55d98f689f81efdecd3ef04e45c7
Commit Graph

87 Commits

Author SHA1 Message Date
Troy Sankey
d428f7530d Revert "Revert "Rename values in SiteConfiguration (2/3) attempt #2"" 
This reverts commit e6f58b6d4c.

This is our third (3rd!) attempt to deploy stage 2 of this column rename.
 2020-03-04 14:53:47 -05:00
Troy Sankey
e6f58b6d4c Revert "Rename values in SiteConfiguration (2/3) attempt #2" 2020-02-27 13:24:55 -05:00
Troy Sankey
c422dec083 Revert "Revert "Rename values in SiteConfiguration (2/3)"" 
This reverts commit b85aa4b3fb.
 2020-02-26 12:54:24 -05:00
Troy Sankey
b85aa4b3fb Revert "Rename values in SiteConfiguration (2/3)" 2020-02-26 11:23:56 -05:00
Julia Eskew
3541643dd5 Rename values in SiteConfiguration (2/3) 
This stage does the following:

- Includes a data migration to copy the values from old to new field.
- Changes business logic to switch to using new field.
- Deletes all code references of the old field.
 2020-02-25 13:54:02 -05:00
Adeel Khan
4b6cf4801c Adds instagram and removes google-plus footer links 
PROD-1178
 2020-01-17 23:27:28 +05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts 
Run `2to3 -f asserts . -w` on edx-platform.
 2019-12-30 12:13:42 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w 
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
 2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform. 
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
 2019-12-30 10:22:19 -05:00
Waheed Ahmed
637e1d0bee Remove YouTube logo from footer. 
Current YouTube logo is not compliant with YouTube's branding
guidelines.

PROD-816
 2019-10-11 12:44:54 +05:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
9bbc21ea8c Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
beb95eb69c Python 3: assertIn -> assertContains consistency 2019-09-30 08:51:01 -04:00
Nimisha Asthagiri
ccefde8d3c Python-3: assertNotIn(..response.content) -> assertNotContains 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
a6b219a9e9 Python-3: assertIn(..response.content) -> assertContains 2019-09-30 08:50:38 -04:00
Ned Batchelder
58828da55b Fix patches to use proper courseware imports 2019-09-26 10:53:55 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Jeremy Bowman
553d35e53e Upgrade mock BOM-596 (#21717) 2019-09-24 10:14:17 -04:00
aarif
3ff6d1b942 changes made to fix failing tests for python 3 
changes made to fix failing tests for python 3

minor changes

minor changes

changes made to fix failing tests for python 3

changes made to fix failing tests for python 3

minor changes

minor changes
 2019-08-21 12:14:53 +05:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
usama sadiq
aa8003baeb Added check to exclude OpenEdx 
Added check to only apply the changes for
edx.org help center pages.
 2019-08-02 12:05:54 +05:00
usama sadiq
d83ec0f607 Updated Help Center Url 
Updated the generated url in the navigation
and footer based on the selected language of
the page.
 2019-08-01 12:12:06 +05:00
Douglas Hall
fc88c55c76 Header logo should now redirect to learner dashboard. (#20815) 2019-06-13 11:07:08 -04:00
Ned Batchelder
f00eb4f3b4 Merge pull request #20600 from edx/nedbat/fix-trademark-notice 
Correct the trademark notices
 2019-05-22 15:36:11 -04:00
Stu Young
175c3c6d03 incr-292 (#20587) 
* run python modernize

* run isort

* Fix imports
 2019-05-16 14:37:44 -04:00
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
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
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -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
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
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
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
Hasnain
bb33a3aa25 LEARNER-1146 | Removed the flag and their corresponding code. 2017-08-23 14:58:47 +05: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