Commit Graph

50508 Commits

Author SHA1 Message Date
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
Ned Batchelder
87c7cbde4d Merge pull request #21191 from edx/nedbat/more-docs
Move existing docs down a level to make room for more
2019-07-23 12:07:46 -04:00
Ned Batchelder
83f66af978 Merge pull request #21138 from edx/nedbat/master-wtw
Who-tests-what, rebased onto master, with make upgrade
2019-07-23 11:48:47 -04:00
Hasnain Naveed
3faf987fc1 Merge pull request #21189 from edx/hasnain-naveed/WL-1948
WL-1948 | Added cornerstone in CMS.
2019-07-23 18:26:52 +05:00
adeelehsan
43604eb6f7 Merge pull request #21188 from edx/aehsan/prod-410/translation_strings_are_passed_to_zendesk
Translation moved to field level for questions in financial form
2019-07-23 18:17:44 +05:00
hasnain-naveed
c42d7de780 WL-1948 | Added cornerstone in CMS. 2019-07-23 17:39:16 +05:00
Ned Batchelder
3b69fe0b47 Move existing docs down a level to make room for more 2019-07-23 08:31:15 -04:00
adeelehsan
9fb1b53aa7 Translation removed from constants in financial form
PROD-410
2019-07-23 17:31:10 +05:00
adeel khan
561aa62da7 Merge pull request #21187 from edx/adeel/fix_wiki_template
Fix wiki template missing endfilter expression
2019-07-23 17:26:26 +05:00
noraiz-anwar
570cd673ef change task_input field's type from CharField to TextField 2019-07-23 17:21:03 +05:00
Ayub
f2be56c3fb Merge pull request #21074 from edx/INCR-412
INCR-412 python3 compatibility
2019-07-23 14:25:17 +05:00
Aarif
dc6e72652a Merge pull request #21045 from edx/INCR-391
INCR-391 Python 3 compatibility
2019-07-23 13:28:49 +05:00
Aarif
f31a5eaeef Merge pull request #21043 from edx/INCR-390
INCR-390 Python 3 compatibility
2019-07-23 13:28:14 +05:00
Adeel Khan
0b9019c618 Fix wiki template missing endfilter expression 2019-07-23 13:13:55 +05:00
Ayub
e8fa5a4fc9 Merge pull request #21164 from edx/INCR-347-2
INCR-347 python3 compatibility
2019-07-23 13:00:08 +05:00
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
Aarif
00717a5f77 Merge pull request #21117 from edx/INCR-448
INCR-448 Python 3 compatibility
2019-07-23 12:26:25 +05:00
Aarif
89f5282089 Merge pull request #21137 from edx/INCR-343
INCR-343 Python 3 compatibility
2019-07-23 12:25:59 +05:00
Ned Batchelder
2234aeb1ab Coverage et al that support who-tests-what 2019-07-22 16:24:55 -04:00
Matt Hughes
7dbf400393 Bump super-csv version
JIRA:EDUCATOR-4435
2019-07-22 14:54:45 -04:00
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
aarif
bb705970b0 ran python-modernize and isort on files mentioned in INCR-391
changes made to comply with quality

ran python-modernize and isort on files mentioned in INCR-391
2019-07-22 13:48:52 +05:00
aarif
0f3cc01f59 ran python-modernize and isort on files mentioned in INCR-390
ran python-modernize and isort on files mentioned in INCR-390

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

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

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

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

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

ran python-modernize and isort on files mentioned in INCR-390
2019-07-22 13:40:35 +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
12ca7b8ab7 Name coverage data files so they won't overwrite each other. 2019-07-20 12:21:05 -04: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