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

77 Commits

Author SHA1 Message Date
Waheed Ahmed
c7f4e16470 Fix XSS lint issues for course_cta_text 
PROD-1602
 2020-05-21 12:51:07 +05:00
M Zulqarnain
39dcc8b180 BOM-1514 : Remove waffle switch PREVENT_AUTH_USER_WRITES (#23686) 
* Remove waffle switch PREVENT_AUTH_USER_WRITES
 2020-04-10 18:21:12 +05:00
Awais Jibran
bb4b38b30b Do not log after sending activation email 2020-03-25 11:54: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
Jeremy Bowman
072b3c11a1 Upgrade edx-ace and edx-django-sites-extensions (#22535) 2019-12-18 14:07:20 -05:00
Mahyar Damavand
4ff5d129c8 Fix issues with PR #18928 ... 
Fix celery task failure
Fix code quality test failures
Fix python test failures
Fix issue with PR #22042
Rebase and fix new test failures
 2019-11-25 23:56:10 +03:30
Shadi Naif
f93023bafe Convert Account Activation Emails to edx-ACE 2019-11-25 23:56:09 +03:30
Ned Batchelder
ea30aba6fc Revert pull request #22042 
Revert "Fix code quality test failures"

This reverts commit 8c55e11d1f.

Revert "Fix celery send_activation_email task failure"

This reverts commit 810eea0e51.

Revert "Convert Account Activation Emails to edx-ACE"

This reverts commit 7984c37a4f.
 2019-10-18 15:31:09 -04:00
Mahyar Damavand
8c55e11d1f Fix code quality test failures 2019-10-16 22:30:31 +03:30
Mahyar Damavand
810eea0e51 Fix celery send_activation_email task failure 2019-10-15 18:30:13 +03:30
Shadi Naif
7984c37a4f Convert Account Activation Emails to edx-ACE 2019-10-14 17:22:03 +03:30
aarif
90b0130a55 python 3 fixes 2019-09-26 18:34:17 +05:00
Feanil Patel
f259a911c7 BOM-618 Decode content we get from test requests. 2019-09-19 10:32:23 -04:00
Adeel Khan
7d9be69112 Fix edx-ace templates 
This patch is part of multiple PR's to
protect templates against xss attack

PROD-465
 2019-07-25 12:51:05 +05:00
Cameron Cairns
6363090144 Addresses INCR-195 - runs modernise /student/tests (#20419) 2019-05-07 15:44:49 -04:00
Bill DeRusha
2b11068622 Revert "Convert Account Activation Emails to edx-ACE" 2019-05-01 16:30:09 -04:00
Shadi Naif
07f588517b Convert Account Activation Emails to edx-ACE 2019-04-27 13:21:34 +03:00
Shadi Naif
1b83f24d3c Convert the (Email Change Confirmation) message to use edx-ACE 
Basically, this was done by:
1. Adding new class type in [common/djangoapps/student/message_types.py]
2. Adding new files for the ace template in a new directory named
    [common/templates/student/edx_ace/emailchangeconfirmation]
3. Removing old template files
    [confirm_email_change.txt] and [email_change_subject.txt]
    from the directories:
    [lms/templates/emails] and
    [common/test/test_sites/test_site/templates/emails]
4. Converting the [confirm_email_change] code to use [ace.send()]
 2019-02-27 16:22:16 +02:00
Saleem Latif
ecc86f9827 Update final copy recovery feature copy 2019-02-07 15:55:42 +05:00
Matthew Piatetsky
9681ca36b8 fix unicode strings in common/ 2019-02-05 10:57:00 -05:00
asadiqbal
e21477c224 Verification by email of recovery address. 2018-12-27 18:51:55 +05:00
Ned Batchelder
046fe60913 Remove unused imports 2018-11-07 10:31:51 -05:00
Omar Al-Ithawi
ceacfc8a75 edX-ACE support for email change messages 2018-10-08 20:43:09 +03:00
edx-pipeline-bot
007869836c Merge pull request #18995 from edx/private_to_public_7a92944 
Mergeback PR from private to public.
 2018-09-24 12:07:56 -04:00
Nimisha Asthagiri
e2ff1ec537 Merge pull request #18917 from edx/arch/user-authn-app 
Consolidate user login and authentication code
 2018-09-15 10:00:51 -04:00
Nimisha Asthagiri
8cf44283c9 Consolidate user login and authentication code 2018-09-15 03:21:39 -04:00
Nimisha Asthagiri
700a902b68 Cleanup and remove deprecated RequestCache Django app 
ARCH-223
 2018-09-12 14:39:11 -04:00
tasawernawaz
cc51494910 Fix for duplicate email validation on account settings page 
LEARNER-6216
 2018-09-05 20:05:55 +05:00
irfanuddinahmad
ead8a78e29 disabled activation email 2018-07-13 12:48:02 +05: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
Troy Sankey
232b359258 Fixup! pivot to treating retired emails as banned forever 2018-05-16 16:44:02 -04:00
Jeremy Bowman
b3ac2b1b06 PLAT-1976 Add waffle switch to block auth_user write attempts 2018-02-28 13:13:06 -05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Troy Sankey
6d061a16c5 Enable cache isolation for test_email tests 
Cache isolation is provided by
CacheIsolationMixin/CacheIsolationTestCase, and was enabled in these
tests in order to stop the 'site' variable in the edxmako template
context from bleeding into subsequent tests via the request cache.
 2018-01-25 11:33:51 -05:00
bmedx
1d45c85135 Refactor student login for readability and fix Django 1.11 issues 2018-01-24 11:26:43 -05:00
christopher lee
8a00b76f01 Disable optimizely for xblocks for the mobile app 2018-01-22 12:05:57 -05:00
Omar Al-Ithawi
8816b85464 Use the marketing contact us page in email confirm change message 2017-07-10 10:24:49 -04:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
Douglas Hall
0a313da601 Remove edx.org theme override of activation email body. 
We have standardized the activation email in the base activation email body template, so we do not need this override any longer.

ENT-318
 2017-05-09 15:46:10 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Ahsan Ulhaq
04ca94eaef Account settings page should load and create student user profile 
ECOM-4776
 2017-04-13 11:47:38 +05:00
uzairr
07ddf9b452 Send activation email to un-activated user 2017-03-02 10:04:09 +00:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02: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
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
Sylvia Pearce
8b1f28d317 Account registration and activation text string revisions 2016-06-27 13:32:53 -04:00
Douglas Hall
51d8580982 Fix default from email lookups 2016-06-22 13:54:57 -04:00