Commit Graph

815 Commits

Author SHA1 Message Date
Nimisha Asthagiri
d6d9a17e67 student app: python-3 upgrade 2019-09-30 08:44:54 -04:00
aarif
d832c21a20 python 3 fixes 2019-09-27 17:17:15 +05:00
Aarif
56ee4e0222 Merge pull request #21791 from edx/BOM-742
BOM-742
2019-09-27 14:49:45 +05:00
Ned Batchelder
b3845b2b96 Merge pull request #21581 from edx/nedbat/fix-courseware-warning
Finally import courseware properly everywhere to get rid of a warning
2019-09-26 14:25:27 -04:00
Waheed Ahmed
5d6a2ea022 Merge pull request #21787 from edx/waheed/PROD-454-use-order-date-attr-for-refund
Use order date_placed enrollment attribute for refund.
2019-09-26 21:20:27 +05: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
aarif
90b0130a55 python 3 fixes 2019-09-26 18:34:17 +05:00
Waheed Ahmed
68b5f98485 Save order date attribute and some refactoring.
Save order placement date attribute so that we don't need to call
ecommerce again. Also did some refactoring.
2019-09-26 17:46:14 +05:00
Waheed Ahmed
551f690ade Use order date_placed enrollment attribute for refund.
Use order date_placed enrollment attribute for refund if exist otherwise
fetch it from ecommerce.

PROD-454
2019-09-26 15:20:00 +05:00
aarif
54cb483fc0 python 3 fixes 2019-09-23 15:30:18 +05:00
Awais Qureshi
d8e49fadab Merge pull request #21727 from edx/awais786/BOM-637
BOM-637
2019-09-21 17:59:58 +05:00
Feanil Patel
57af13ddc4 Merge pull request #21721 from edx/python3-swarm-2
Python3 swarm 2
2019-09-20 08:48:19 -04:00
Ayub
39fed7c8fa Merge pull request #21706 from edx/BOM-723
BOM-723
2019-09-20 15:39:43 +05:00
Awais Qureshi
63ff4c147c BOM-637
Fixing python3
2019-09-20 15:19:05 +05:00
Feanil Patel
4eaf875741 BOM-621 Fix hashing in a bunch of places. 2019-09-19 15:53:39 -04:00
Feanil Patel
cbf35593ac BOM-618 Decode to utf-8 before loading as json in tests. 2019-09-19 11:15:11 -04:00
Feanil Patel
f259a911c7 BOM-618 Decode content we get from test requests. 2019-09-19 10:32:23 -04:00
Ayub khan
00a1db4109 BOM-723
python3 compatibility
2019-09-19 15:51:20 +05:00
Jeremy Bowman
f68c7e87f7 Fix student.helpers logging tests 2019-09-18 12:59:32 -04:00
aarif
18ac219171 python 3 fixes
made changes as requested

minor fixes

quality fixes
2019-09-16 22:09:49 +05:00
aarif
ae8126bf98 python 3 fixes 2019-09-13 16:50:20 +05:00
Waheed Ahmed
9f80fd2b87 Fixed password reset for authenticated user.
Password reset link for one user is working for other logged in users.
Fixed by verifying the token with request.user if authenticated.

LEARNER-5114
2019-09-02 15:30:25 +05:00
Dave St.Germain
a3b52662d1 Prevent changing dict while iterating 2019-08-19 16:27:04 -04: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
Ayub khan
2244540ade BOM-78
Update uuid4().hex.decode(ascii) calls
2019-08-06 17:16:08 +05: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
David Ormsbee
0f51b58f75 Remove user cookie reset on Student Dashboard.
The enrollmentStatusHash cookie value was created in commit f0030334
as an optimization, in order to determine whether the marketing site
needs to refresh the list of a student's enrolled courses with a
call to the LMS. To ensure that this value was kept up to date,
commit d7a7bcc1 reset the user's cookies every time they go to the
learner dashboard page (which used to be the next page loaded after
you enrolled in a course). This didn't just reset the
enrollmentStatusHash though -- it recalculated all the cookie
values, as if you had just logged in.

A number of things have changed since then:

1. Enrolling in a course now goes to that course's info/navigation
   page, rather than going to the student dashboard.
2. It doesn't appear that the value of enrollmentStatusHash is
   actually being examined anywhere -- it's set in a cookie on the
   LMS and read/written by the edX marketing front end code, but
   the value is never looked at to make any decisions.
3. The introduction of add_email_marketing_cookies (which triggers
   off of the CREATE_LOGON_COOKIE signal) has made cookie resets
   far more expensive, as there is a blocking call to Sailthru if
   you have that enabled in EmailMarketingConfiguration (which
   edx.org does). This can add over two seconds to the server
   processing time for the student dashboard at certain times of
   day.

Given this, I'm removing both the call to resetting the cookie on
the student dashboard page, as well as setting the value for
enrollmentStatusHash.
2019-07-21 20:16:19 -04:00
adeelehsan
2d369490dd Flag added to load limited courses on Dashboard
Dashboard is set to load 250 courses instead of
all the courses. A flag is also added to change
the number the courses to load.

PROD-204
2019-06-28 22:51:41 +05:00
Calen Pennington
390122ec93 Make CourseOverviewFactory create new courses every time (unless otherwise specified) 2019-06-25 12:04:59 -04:00
David Ormsbee
74492907d8 Merge pull request #19582 from open-craft/josuebc/upstream/BB-732
BB-732 Fix Django admin form for Course Enrollment
2019-06-04 18:21:53 -04:00
Michael Roytman
b33b8e8897 introduce Python API for BulkEmail Djangoapp 2019-05-21 09:22:08 -04:00
Josue Balandrano Coronel
0e85af8a98 Update CourseEnrollment Admin ModelForm to correct edit and create
student enrollments. We no longer need to parse the course key into an
opaque key since the opaque key class can already handle strings and the
parsing happens there. We also need to specify which course enrollment
are we editing or else the reference is lost when saving the edits.
2019-05-18 17:24:13 +02: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
Josue Balandrano Coronel
78f4ccb50a Expose LoginFailure model to Django's Admin UI to allow admin users
unlock student accounts that have been locked out for excessive login
failures. This change will allow to quickly unlock student accounts when
time is of the essence (e.g. Timed exams).
2019-03-22 10:22:01 -05:00
Matthew Piatetsky
d5c50533e1 Merge pull request #19968 from edx/PROD-58
handle incorrectly set schedules
2019-03-12 12:16:03 -04:00
Waheed Ahmed
458e8482ea Fix change enrollment command for credit.
Get provider id from ecommerce upon changing enrollment to credit
instead of setting course_key org.

LEARNER-6643
2019-03-12 15:30:48 +05:00
Matthew Piatetsky
dac0eec385 handle incorrectly set schedules 2019-03-11 16:46:29 -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
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
Bessie Steinberg
1a94a69560 ENT-1512: Make Recovery Email Retireable 2019-02-15 14:21:32 -05:00
Michael Youngstrom
4bbd1dee0b Remove shards from commonlib-unit tests 2019-02-12 14:28:35 -05: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
Julia Eskew
48073300e7 Merge pull request #19106 from open-craft/clemente/fix-courseenrollment-admin-querydict
Fix error when saving CourseEnrollment in admin
2019-01-28 11:14:04 -05:00
Daniel Clemente Laboreo
e0b0c375be Fix error when saving CourseEnrollment in admin 2019-01-28 14:42:41 +02:00
Saleem Latif
2c9021e480 Make sure only active AccountRecovery records are used 2019-01-09 16:33:12 +05:00
Julia Eskew
39accc0ae9 Make hash generation method private. 2019-01-08 15:08:59 -05:00