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

54328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave St.Germain
cd7f88e1be Merge pull request #23937 from edx/dcs/researcher-admin 
Enable access role in django admin
 2020-05-07 12:18:23 -04:00
Matt Tuchfarber
8193763e92 Merge pull request #23931 from edx/tuchfarber/strip_phone_number 
Strip non-numeric characters from phone number
 2020-05-07 11:40:01 -04:00
Dave St.Germain
fedcf045eb Enable access role in django admin 2020-05-07 10:45:24 -04:00
Matt Tuchfarber
4910cfa180 Strip non-numeric characters from phone number 
Allows user to type in phone number in whichever
format they prefer.
 2020-05-07 10:10:42 -04:00
Ned Batchelder
1fc881b90e Merge pull request #23911 from shadinaif/shadinaif/fix-untranslated-text 
Missing translation function call
 2020-05-07 09:59:29 -04:00
Nick
7db6e92977 Merge pull request #23923 from edx/ndalfonso/AA-149-enable-masquerade-on-dates-tab 
Enable masquerade on dates tab
 2020-05-07 09:48:15 -04:00
Robert Raposa
b98d200fdc Revert "Dark launch: Fix site shadowing and 1+N queries in third party auth config fetching (#23824)" (#23935) 
This reverts commit 79420640d5.
 2020-05-07 09:38:54 -04:00
Michael Roytman
681c3ebed0 Merge pull request #23873 from edx/mroytman/MST-181-program-enrollment-sync-support-tool 
MST-181: Add the ability to unlink and relink Program Enrollments via Support Tool to Address SSO Issues
 2020-05-07 09:25:54 -04:00
Shadi Naif
7142d55b1a Missing translation function call 2020-05-07 14:32:50 +03:00
Waheed Ahmed
c603111895 added another test case. 2020-05-07 15:14:31 +05:00
Waheed Ahmed
05d18effde Implement both IP and email based rate limiting. 2020-05-07 15:14:31 +05:00
Waheed Ahmed
f3db71171e Fix password reset rate limiting for existing users. 
PROD-1427
 2020-05-07 15:14:31 +05:00
Ned Batchelder
5caf9b02fa Merge pull request #23922 from regisb/regisb/fix-offset-naive-static-assets 
Fix naive offset-naive/aware error in asset compilation [CRI-191]
 2020-05-06 17:13:30 -04:00
edX Transifex Bot
eeecda6703 geoip2: update maxmind geolite country database 2020-05-06 16:54:21 -04:00
Jeff Chaves
56fb62cad0 ran make upgrade to bump edx-enterprise version (#23925) 2020-05-06 16:09:50 -04:00
Adam Butterworth
42cc0d0145 Fix all stylelint errors (#23920) 
* Fix all stylelint errors

For any errors that fixing would require changing the output of the css disable stylelint for that line instead of modifying.

* Update quality.py

Make stylelint quality check pass when there are no errors

* Delete empty selectors
 2020-05-06 16:07:14 -04:00
Nicholas D'Alfonso
5d28f0e0c3 Enable masquerade on dates tab 2020-05-06 13:28:22 -04:00
edX requirements bot
485e36e44a Updating Python Requirements (#23912) 2020-05-06 16:44:20 +00:00
Régis Behmo
1d859569b6 Fix naive offset-naive/aware error in asset compilation 
The XBlockPackageStorage used to return offset-naive datetime objects
which were compared to offset-aware objects when we ran static asset
collection:

    ./manage.py lms collectstatic

Close CRI-191
 2020-05-06 18:39:46 +02:00
Michael Roytman
38c255dbd2 Enhance the Link Program Enrollments Support Tool to handle the case of linking a learner to a ProgramEnrollment that is already linked to a different edX account. 
In this case,
* unenroll the currently linked learner from the courses associated with related ProgramCourseEnrollments
* for each course the is enrolled in as part of a ProgramCourseEnrollment, if the coures has an audit track, then move the enrollment into the audit track. Otherwise, keep the learner's enrollment in the existing track.
* link the new user to the ProgramEnrollment
* enroll the new user in the Master's track in the courses associated with related ProgramCourseEnrollments
 2020-05-06 10:15:42 -04:00
Tim McCormack
79420640d5 Dark launch: Fix site shadowing and 1+N queries in third party auth config fetching (#23824) 
This performs a dark launch compare of the existing implementation
(still in use) for fetching TPA provider configs and a new
implementation, recording metrics on exceptions and mismatches.

The new implementation should have two benefits, once we're switched
over:

- Fix 1+N queries on login page view where the site for each config
  was fetched in a loop (ARCHBOM-1139)
- Don't allow configs with the same key on different sites to
  interfere with each other (regression test added)

The new impl does not use TieredCache, but only the request cache,
which we may want to adjust later.
 2020-05-06 13:54:32 +00:00
Jeff LaJoie
4f32e5728b Merge pull request #23600 from edx/jlajoie/AA-67 
AA-67: New resolver logic for weekly highlights
 2020-05-06 09:31:39 -04:00
Dillon Dumesnil
10759a9046 Merge pull request #23819 from edx/ddumesnil/more-date-pills-aa-99 
AA-99: Adding in new date pills for the dates tab
 2020-05-06 06:12:50 -07:00
Syed Muhammad Dawoud Sheraz Ali
6a78c30ac8 add transcript failed status (#23838) 2020-05-06 10:13:13 +05:00
Simon Chen
262574b815 Move all the upgrade display logic into courseware.utils 2020-05-05 17:54:22 -04:00
Robert Raposa
b9a51eb250 update diff_quality message and tests (#23896) 
- remove unused assertions
- add tests for exception handling
- update error message
 2020-05-05 15:55:37 -04:00
Robert Raposa
2b7847d613 upgrade edx-drf-extensions (#23905) 
Improved authentication metrics.
 2020-05-05 15:55:17 -04:00
Feanil Patel
f95158458e Merge pull request #23888 from edx/feanil/update_bokchoy_adr 
Bokchoy ADR Updates.
 2020-05-05 15:16:42 -04:00
Dave St.Germain
29c0cc7b5e Merge pull request #23891 from edx/dcs/mfe-redirect 
Redirect to courseware MFE, including unit
 2020-05-05 13:58:17 -04:00
Feanil Patel
3a6b2afe0c Merge pull request #23895 from edx/feanil/simplify_bokchoy_config 
Feanil/simplify bokchoy config
 2020-05-05 13:43:05 -04:00
Adam Butterworth
a889536dbd Add the appropriate auth classes to courseware api views (#23901) 
Allows users who are logged in but have not activated their accounts to be considered authenticated for the purpose of the courseware api
 2020-05-05 13:37:24 -04:00
Feanil Patel
db1dd0838e Merge pull request #23900 from edx/revert-23893-revert-23804-feanil/remove_coercion 
Revert "Revert "We don't run into this case anymore so remove it.""
 2020-05-05 13:05:36 -04:00
Feanil Patel
a0f81a17ee Revert "Revert "We don't run into this case anymore so remove it."" 2020-05-05 11:49:18 -04:00
Jeff LaJoie
542905bee4 AA-67: Adds in new resolver logic for Weekly Highlights to learners 2020-05-05 10:32:18 -04:00
Feanil Patel
307986575e Make updates based on feedback. 2020-05-05 09:54:05 -04:00
Feanil Patel
865eca0c7d This is now handled by production.py 2020-05-05 09:38:13 -04:00
Adam Stankiewicz
dffaa74e00 Merge pull request #23894 from edx/astankiewicz/revert-learner-portal-links 
revert learner portal links blocking juniper release
 2020-05-05 09:35:46 -04:00
Gabe Mulley
8dd633b6e5 Merge pull request #23856 from edx/mulby/log-reg-failures 
log registration failures
 2020-05-05 08:50:07 -04:00
edX requirements bot
7890d71254 Updating Python Requirements (#23899) 2020-05-05 08:43:05 -04:00
Ahtisham Shahid
0d8c99aa2f Merge pull request #23807 from edx/ahtisham/PROD-1491 
Fixed unicode-objects must be encoded before hashing mako template error
 2020-05-05 11:59:24 +05:00
Gabe Mulley
9f287165bd log registration failures 2020-05-04 16:20:12 -04:00
Feanil Patel
b0931dd166 Move settings out of bok_choy.py to bok_choy.yml 
There's more to do here but get the easy ones first and make sure we didn't break anything.
 2020-05-04 16:05:53 -04:00
Feanil Patel
e15c2c5187 Remove load_test.py which we don't use anywhere. 2020-05-04 16:05:24 -04:00
Feanil Patel
0e7a0b6d59 Merge pull request #23893 from edx/revert-23804-feanil/remove_coercion 
Revert "We don't run into this case anymore so remove it."
 2020-05-04 15:02:12 -04:00
Adam Stankiewicz
6d942bc94d revert learner portal links blocking juniper release 2020-05-04 14:55:06 -04:00
Feanil Patel
ba2c712e4e Revert "We don't run into this case anymore so remove it." 2020-05-04 14:28:54 -04:00
Dave St.Germain
2c400184e4 Redirect to courseware MFE, including unit 2020-05-04 13:49:20 -04:00
Feanil Patel
bc8aa8bf7a Merge pull request #23829 from edx/feanil/settings_adr 
An initial draft of a decision around how we manage settings files.
 2020-05-04 12:45:38 -04:00
Nick
c673f25cd9 Merge pull request #23890 from edx/ndalfonso/fix-course-outline-reset-banner 
Check if subsection is graded on course outline page
 2020-05-04 12:44:58 -04:00
Ned Batchelder
41a999717a Merge pull request #23872 from edx/nedbat/ascii-setup-cfg 
Ensure setup.cfg is only ASCII.  CRI-169
 2020-05-04 12:21:15 -04:00