Commit Graph

18841 Commits

Author SHA1 Message Date
Muhammad Zaid Bamber
ffc2d9729b Revert "Added logs for XQueue Information" 2019-07-30 14:14:04 +05:00
Adeel Khan
05718a63db Fix xss-linter directives from edx-ace templates
PROD-508
2019-07-30 13:34:44 +05:00
Ayub khan
fdd8652bb6 INCR-421 2019-07-30 12:23:10 +05:00
Ayub
cf74aee8ff Merge pull request #21099 from edx/INCR-429
INCR-429 python3 compatibility
2019-07-30 12:07:28 +05:00
Feanil Patel
bb8420bb51 Rmove the extra configurabilty logic for reset buttons.
The `DEFAULT_SHOW_RESET_BUTTON` is not actually referenced anywhere
other than in these two places where it's read.  As far as I can tell,
nothing sets this value so it's always going to fallback to false.

Since this mixin is imported during startup, removing this unblocks
testing on python3 where it can fail to start up if the settings haven't
fully loaded before you try to access them.
2019-07-29 13:55:22 -04:00
Feanil Patel
da3cdb4f26 Merge pull request #21232 from edx/feanil/remove_parsepy_leftovers
Feanil/remove parsepy leftovers
2019-07-29 10:52:13 -04:00
Waheed Ahmed
4a8f81f8bf Merge pull request #21230 from edx/waheed/PROD-482-remove-utm-param-from-pwd-reset
Remove UTM params from password reset link.
2019-07-29 18:48:40 +05:00
Calen Pennington
a8a1dffbbb Merge pull request #21211 from cpennington/correct-combine
Check the test-suite specific coverage file, and upload it earlier in…
2019-07-29 09:39:08 -04:00
Waheed Ahmed
ecf9485e59 Remove UTM params from password reset link.
This type of email is just a transactional message
and should not be crediting revenue to email. Removed
UTM parameters and added ?track=pwreset query param.

PROD-482
2019-07-29 18:21:30 +05:00
irfanuddinahmad
e723448a77 minor logs update 2019-07-29 16:22:42 +05:00
Feanil Patel
636af346d5 Don't skip the migration test. 2019-07-26 16:27:14 -04:00
Calen Pennington
82c49f0db9 Separate bokchoy coverage files by shard 2019-07-26 14:58:44 -04:00
Muhammad Zaid Bamber
b7d4f30769 Revert "Fixed CDN urls to Static urls on edit." 2019-07-26 11:42:15 +05:00
David Ormsbee
b1f3d2cef2 Revert "Fix the unpredictable order randomization issue with randomized content blocks" 2019-07-25 13:42:20 -04:00
Feanil Patel
e1b9869b26 Merge pull request #21194 from edx/feanil/remove_parsepy
DEPR-41 Remove parsepy
2019-07-25 10:25:08 -04:00
irfanuddinahmad
a6045f9d13 Merge pull request #21217 from edx/iahmad/ENT-1954-Reformat-Logs-For-Enterprise-SSO-Workflows
ENT-1954: Reformatted logging for third party auth
2019-07-25 17:31:40 +05:00
irfanuddinahmad
df1c7f553a reformatted logging 2019-07-25 16:10:48 +05:00
Ayub
877168f72b Merge pull request #21081 from edx/INCR-420
INCR-420 python3 compatibility
2019-07-25 15:50:03 +05:00
Ayub
c5a4154400 Merge pull request #21098 from edx/INCR-428
INCR-428 python3 compatbility
2019-07-25 15:49:28 +05:00
Ayub
dc9f67c618 Merge pull request #21096 from edx/INCR-427
INCR-427 python3 compatibility
2019-07-25 14:50:38 +05:00
Ayub
2a22ff3890 Merge pull request #21080 from edx/INCR-419
INCR-419 python3 compatibility
2019-07-25 14:50:06 +05:00
Aarif
5255799845 Merge pull request #21085 from edx/INCR-423
INCR-423 Python 3 compatibility
2019-07-25 14:34:21 +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
edX Transifex Bot
99868f9fca geoip2: update maxmind geolite country database 2019-07-24 16:52:24 -04:00
Guruprasad Lakshmi Narayanan
df4aee23b9 Fix the order randomization behaviour of Randomized Content Block
The Randomized Content Block XBlock only randomizes the selection of
the children blocks and has unpredictable randomization of
the order of the selected child blocks due to the usage of sets, which
are unordered, for storing the selected blocks. This becomes apparent
when all the available child blocks in a library are chosen for a
Randomized Content Block, to randomize just the order of the child
blocks and not just the selection of the blocks. The order of the
selected blocks ends up being similar for multiple learners.

This change modifies the XBlock to store the selected child blocks in
a list, instead of a set, after randomly shuffling them.
2019-07-25 00:58:11 +05:30
Feanil Patel
1f7b12a38d Remove references to push notifications.
Push notifications was only ever setup to connect to Parse.com a service
that has been discontinued.  Since we haven't replaced the functionality
for a few years now, remove this dead code.

In cms/templates/js/course_info_update.underscore we're allowing content
to not be escaped because this is by design according to the tests.
Long term there should be a better fix for this but for now this is
intended behavior.
2019-07-24 11:45:46 -04:00
Usman Khalid
8dfc8e5fda Convert AboutModule, CourseInfoModule, HtmlModule and StaticTabModule to XBlocks. 2019-07-24 20:19:44 +05:00
aarif
86b810a23a ran python-modernize and isort on files mentioned in INCR-410
Updated the file as suggested

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality

ran python-modernize and isort on files mentioned in INCR-410

Updated the file as suggested

changes made to comply with quality
2019-07-24 09:50:13 +00:00
Ayub
78f9a0d19c Merge pull request #21079 from edx/INCR-418
INCR-418 python3 compatibility
2019-07-24 09:48:27 +05:00
Ayub
a5f9cb5227 Merge pull request #21078 from edx/INCR-417
INCR-417 python3 compatibility
2019-07-24 09:47:23 +05:00
Ayub
6b034760e0 Merge pull request #21077 from edx/INCR-416
INCR-416 python3 compatibility
2019-07-24 09:46:03 +05:00
Ayub
bf47019e4c Merge pull request #21076 from edx/INCR-414
INCR-414 python3 compatibility
2019-07-24 09:44:48 +05:00
Kshitij Sobti
61bb9bc6e2 Add support for using an authentication database for MongoDB.
A popular convention is to have user accounts stored in a separate authentication
database. This change add support for configuring edx-platform to work with
such a setup.
2019-07-24 01:16:33 +05:30
Ayub khan
0698c10d29 INCR-412 python3 compatibility 2019-07-23 12:57:16 +05:00
Ayub
6db7a08268 Merge pull request #21072 from edx/INCR-408
INCR-408 python3 compatibility
2019-07-23 12:33:40 +05:00
Ayub
d98133a96a Merge pull request #21071 from edx/INCR-407
INCR-407 python3 compatibility
2019-07-23 12:30:41 +05:00
Ayub
829855f6c5 Merge pull request #21070 from edx/INCR-406
INCR-406 python3 compatibility
2019-07-23 12:30:14 +05:00
David Ormsbee
7c9f4a2533 Merge pull request #21178 from edx/ormsbee/remove_dashbaord_cookie_reset
Remove user cookie reset on Student Dashboard.
2019-07-22 10:40:42 -04:00
Ayub
16c7227c07 Merge pull request #21068 from edx/INCR-403
INCR-403 python3 compatibility
2019-07-22 14:52:04 +05:00
Ayub
560da82837 Merge pull request #21067 from edx/INCR-402
INCR-402 python3 compatibility
2019-07-22 14:47:18 +05:00
Aarif
04bcfa5c3e Merge pull request #21083 from edx/INCR-422
INCR-422 Python 3 compatibility
2019-07-22 14:33:48 +05:00
Aarif
d77b2fe9cc Merge pull request #21082 from edx/INCR-415
INCR-415 Python 3 compatibility
2019-07-22 13:53:15 +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
Uzair Rasheed
eed0dfbbe4 Merge pull request #21149 from edx/PROD-305/add-credit-mode-enrollment
Add credit mode in support enrollment tool.
2019-07-21 00:45:52 +05:00
Feanil Patel
7ae8221a47 Merge pull request #21055 from amitvadhel/INCR-411
INCR-411: Updates on Python 3.x
2019-07-19 10:18:04 -04:00
aarif
ccff822a28 ran python-modernize and isort on files mentioned in INCR-396 2019-07-19 10:04:05 -04:00
Ayub khan
83bc838fae python 3 compatibility 2019-07-19 10:02:38 -04:00
Ayub khan
33bcb76a26 INCR-400 python3 compatibility 2019-07-19 10:00:39 -04:00
Feanil Patel
d1556fc86d md5 needs bytes in python 3 but a sting is fine in python2. 2019-07-19 09:48:10 -04:00
Feanil Patel
d9c9d7bab9 Deal with NoneType access.
The `NoneType` object is not available from the `types` module in
python 3. This is a workaronud to deal with that.
2019-07-19 09:48:10 -04:00