Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,476 Commits 1 Branch 0 Tags
8dbc1c2fcc94cd6da73ffd084353dcd9bb4eefde
Commit Graph

50476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dusenbery
8dbc1c2fcc EDUCATOR-4498 | Allow generate_jwt_signing_key to not include key prefixes. 2019-07-22 13:57:11 -04:00
Kyle McCormick
13681eb499 Add --update option to create_dot_access (#21172) 2019-07-22 13:15:23 -04: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
5ec20b98b1 Merge pull request #21112 from edx/INCR-435 
INCR-435 Python 3 compatibility
 2019-07-22 14:28:26 +05:00
Ayub
044dc5f10a Merge pull request #21038 from edx/INCR-384 
INCR-384 python 3 compatibility
 2019-07-22 14:24:00 +05:00
Ayub
6e1cd04ddd Merge pull request #21036 from edx/INCR-386 
INCR-386 python3 compatibility
 2019-07-22 14:23:06 +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
edX Transifex Bot
262546f06e fix(i18n): update translations 2019-07-22 04:27:18 -04:00
Aarif
2e85a36ad5 Merge pull request #20982 from edx/INCR-327 
INCR-327 Python 3 compatibility
 2019-07-22 13:23:36 +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
Ned Batchelder
c8c39c613d Merge pull request #21170 from edx/nedbat/pin-pip-tools 
Pin pip-tools==3.8.0 because of bugs
 2019-07-19 14:43:53 -04:00
Feanil Patel
ecce0d0c96 Merge pull request #21169 from edx/renovate/backbone.paginator-2.x 
Update dependency backbone.paginator to v2.0.8
 2019-07-19 14:23:28 -04:00
Ned Batchelder
1ec0486553 Pin pip-tools because of bugs 2019-07-19 13:59:43 -04:00
Feanil Patel
c522a59197 Make lock file be from npm 5.5.1 2019-07-19 13:33:40 -04:00
Renovate Bot
87602843ff Update dependency backbone.paginator to v2.0.8 2019-07-19 15:57:32 +00:00
Feanil Patel
38c7644112 Merge pull request #21153 from edx/renovate/backbone-1.x 
Update dependency backbone to v1.4.0
 2019-07-19 11:55:32 -04:00
Farhanah Sheets
7385841c4b Merge pull request #21135 from edx/waheed/PROD-478-move-sso-button 
Move secondary SSO login button.
 2019-07-19 11:30:35 -04:00
Feanil Patel
4ee06bc49e Run with our older version of npm. 2019-07-19 11:23:48 -04:00
Christie Rice
fee8e17f95 REVMI-341 Stop sending lms_client_id in jwt sent to ecommerce (#21167) 2019-07-19 10:46:46 -04: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
Ayub khan
3a04fbd37a INCR-440 python3 compatibility 2019-07-19 09:54:52 -04:00
Ayub khan
99060623ac INCR-442 python3 compatibility 2019-07-19 09:53:01 -04:00
Feanil Patel
b94b211c29 In python3 force_unicode is renamed to force_text. 2019-07-19 09:48:10 -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
Feanil Patel
e51fae3784 letters doesn't exist in python 3.6 
Use `ascii_letters` instead which is a reasonable alternative for our
usecases.
 2019-07-19 09:48:10 -04:00
Michael Youngstrom
4d1a320fa0 Add Vars to tox that are needed to get tests to start running. 2019-07-19 09:48:10 -04:00
uzairr
07821927e2 Add credit modein support enrollment tool. 
Currently, enrollment support tool is only allowing support members
to change course enrollment only one of the two modes i.e. audit and
verified.To move a learner other than these modes,they need to ping
devops.To broaden the scope of enrollment support tool,changes have
been done so that enrollment would be changed to other modes as well.

PROD-305
 2019-07-19 18:14:35 +05:00
Syed Muhammad Dawoud Sheraz Ali
f293b74fca Merge pull request #21148 from edx/dsheraz/educator-4499 
add submission deadline methods in InheritanceMixin
 2019-07-19 16:32:29 +05:00
DawoudSheraz
7131809fec add submission deadline methods in InheritanceMixin 2019-07-19 16:06:06 +05:00
Awais Qureshi
6edf9766df Merge pull request #21134 from edx/awais786/INCR-443 
INCR-443
 2019-07-19 13:46:34 +05:00
Awais Qureshi
3d2e0f7dde Merge pull request #21133 from edx/awais786/INCR-445 
INCR-445
 2019-07-19 13:44:38 +05:00
Ayub
10df92857f Merge pull request #21035 from edx/INCR-380 
INCR-380 python 3 compatibility
 2019-07-19 12:25:43 +05:00
Ayub
8da4955ea9 Merge pull request #21034 from edx/INCR-379 
INCR-379 python 3 compatibility
 2019-07-19 12:25:06 +05:00
Ayub
ef1da0f007 Merge pull request #21032 from edx/INCR-377 
INCR-377 python 3 compatibility
 2019-07-19 12:24:25 +05:00
Awais Qureshi
3ed1399216 Merge pull request #21065 from edx/awais786/INCR-398 
INCR-398
 2019-07-19 11:33:43 +05:00
amitvadhel
7d05a9666a INCR-411: Disable python-wrap-html for xss-lint 2019-07-18 21:29:32 +03:00
Muhammad Zaid Bamber
cc985a407b Merge pull request #20793 from edx/zaid-prod-250 
Fixed CDN urls to Static urls on edit.
 2019-07-18 18:53:59 +05:00
zaidbamber161
d3b1fd24f7 Fixed CDN urls to Static urls. 2019-07-18 17:48:00 +05:00
Awais Qureshi
af50c3c043 Merge pull request #21063 from edx/awais786/INCR-397 
INCR-397
 2019-07-18 14:34:43 +05:00
Aarif
a806a7f046 Merge pull request #21042 from edx/INCR-387 
INCR-387 Python 3 compatibility
 2019-07-18 13:14:10 +05:00
Aarif
d0a73e7f1a Merge pull request #21037 from edx/INCR-382 
INCR-382 Python 3 compatibility
 2019-07-18 13:13:47 +05:00
Awais Qureshi
8b278f3ac2 Merge pull request #21062 from edx/awais786/INCR-395 
INCR-395
 2019-07-18 12:19:30 +05:00