Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5589 Commits

Author SHA1 Message Date
Adam Butterworth
ca1dfbce70 fix: fragment include directive should include files in themes if they exist (#22880) 2020-01-17 09:00:03 -05:00
Calen Pennington
9c5f1271cf Merge pull request #22865 from cpennington/dont-delete-course-overviews 
Dont delete course overviews
 2020-01-16 13:57:13 -05:00
Calen Pennington
be5ca3dedd Add a test that shows that CourseModes aren't deleted when CourseOverview versions are updated 2020-01-16 12:07:27 -05:00
Brian Wilson
d290904213 Update edx-val from 1.2.0 to 1.2.1 
This is step 3 of DE-1824.

Also update:
* six 1.13.0 => 1.14.0
* edx-django-utils 2.0.2 => 2.0.3
* skip test that checks all model changes have migrations.  (We defer
  this to step 4.)
 2020-01-15 16:02:28 -05:00
Calen Pennington
675b8c0d71 CourseOverviews may be deleted, but we don't want to delete related objects 2020-01-15 15:23:51 -05:00
Zulqarnain
93a726ff6b Merge branch 'master' into zulqarnain/BOM-1138 2020-01-14 15:25:20 +05:00
Awais Qureshi
1e572ef539 Merge pull request #22770 from edx/awais786/BOM-1084 
BOM-1084
 2020-01-14 09:34:58 +05:00
Awais Qureshi
a2ab14d756 Bom-1146 
Enabling migration test.
 2020-01-13 20:27:53 +05:00
Awais Qureshi
8b3b045803 BOM-1084 
Bump django-filter.
Rename the name to field-name.
 2020-01-13 20:25:44 +05:00
Aarif
d89a1b872d Merge pull request #22713 from edx/BOM-1131 
Updated the Mako Loader to remove deprecated methods
 2020-01-10 21:34:04 +05:00
Awais Qureshi
390bae36e8 Bom-1146 
Due to some recent schema changes this test is failing. Temporarily skipping it. Fix it in other PR.
 2020-01-10 10:59:45 +05:00
mraarif
ecdf2a3ebd updated the custom Loader to remove deprecated methods 2020-01-10 03:16:29 +05:00
Stu Young
6fa7940792 Add django simple history to student.ManualEnrollmentAudit (#22629) 
add django simple history to student.ManualEnrollmentAudit
 2020-01-09 16:29:18 -05:00
David Ormsbee
bb271e10e8 Revert "Request cache context processor output." 
This reverts commit ad5cc3d5d9.

This was causing middleware errors while processing 404s.
 2020-01-09 10:51:42 -05:00
Mahyar Damavand
f1c5981fab Removing deprecated management commands which intended to clear historical data (#21522) 2020-01-08 12:50:34 -05:00
Zulqarnain
cf58da6ee0 Update assertRedirects usage 2020-01-08 14:35:40 +05:00
Usama Sadiq
2de89d6e49 Merge pull request #22732 from edx/usama/bom-1136 
BOM-1136
 2020-01-08 11:49:04 +05:00
Troy Sankey
1178ad8b8b Rename order in CreditRequirement (3/3) 
This stage does the following:

- Includes a migration to delete the old column.
- NO code changes.
 2020-01-07 19:17:56 +05:00
usama sadiq
1c52f19f19 Deprecation of the direct assignment to the forward side of a many-to-many set 
Changed the direct assignments with the use of set() method.
 2020-01-07 14:40:23 +05:00
Troy Sankey
407c8cb076 Rename order in CreditRequirement (2/3) 
This stage does the following:

- Includes a data migration to copy the values from old to new field.
- Changes business logic to switch to using new field.
- Deletes all code references of the old field.
 2020-01-03 18:07:28 +05:00
Ned Batchelder
05700f724e Remove unused code 2020-01-02 07:22:17 -05:00
David Ormsbee
ad5cc3d5d9 Request cache context processor output. 
In Django template rendering, context processors only run once.
But when we do template rendering through edxmako (which we do for
each and every web fragment/XBlock), we can end up having hundreds
of invocations of templates and run context processors for each
separately. This removes that work.
 2019-12-30 16:38:46 -05:00
David Ormsbee
2cb2265ffe Add request caching to reduce ORM queries 
This adds request caching to the following places:
* course expiration wrapper (displayed in Units)
* offer banner generation (displayed in Units)
* get_enrollment
* user_by_anonymous_id
* youtube_disabled_for_course

On a sample course with edx-val enabled, this reduced the queries
for a large sequence from 450 to 155.
 2019-12-30 16:19:25 -05:00
Feanil Patel
046feb0cf0 Merge pull request #22649 from edx/feanil/fix_pep8 
Fix all E303 pep8 errors.
 2019-12-30 13:32:26 -05:00
Feanil Patel
6e3fe00fff Fix all E303 pep8 errors. 2019-12-30 12:25:38 -05:00
Feanil Patel
2df8b8226b Merge pull request #22643 from edx/feanil/2to3_asserts 
Run `2to3 -f asserts . -w` on edx-platform.
 2019-12-30 12:13:42 -05:00
Feanil Patel
9cf2f9f298 Run 2to3 -f future . -w 
This will remove imports from __future__ that are no longer needed.

https://docs.python.org/3.5/library/2to3.html#2to3fixer-future
 2019-12-30 10:35:30 -05:00
Feanil Patel
70294b0ad2 Run 2to3 -f asserts . -w on edx-platform. 
https://docs.python.org/3.5/library/2to3.html#2to3fixer-asserts
 2019-12-30 10:22:19 -05:00
Awais Qureshi
804a84f9cf BOM-1124 
Direct assignment to the forward side of a many-to-many set is deprecated Fixing this issue.
 2019-12-28 00:04:15 +05:00
David Ormsbee
a4b64c3a79 Merge pull request #21166 from open-craft/guruprasad/fix-courseenrollment-mode-default 
[BB-1506] Use a callable as the default value for CourseEnrollment.mode
 2019-12-26 10:25:27 -05:00
Calen Pennington
c83d0e2ca8 OverwriteStorage was removed from django-storages, so pull it into edx-platform (for now?) 2019-12-19 14:06:30 -05:00
Aarif
10a00f8c98 Merge pull request #22508 from edx/BOM-1082 
Updated the django-countries to support Django 2.2
 2019-12-19 12:15:04 +05:00
Dillon-Dumesnil
50534a8844 Merge pull request #22566 from edx/ddumesnil/disco-1522 
DISCO-1522: check if enrolled before congrats message
 2019-12-18 20:31:41 +00:00
Dillon Dumesnil
7165eeff44 DISCO-1522: check if enrolled before congrats message 
This helps out the Verified Only case where the user
is not first enrolled as an audit learner.
 2019-12-18 19:54:28 +00:00
Jeremy Bowman
072b3c11a1 Upgrade edx-ace and edx-django-sites-extensions (#22535) 2019-12-18 14:07:20 -05:00
aarif
d81af828fb updated the django-countries to version that supports django 2.2 
updated the tests

minor changes

changes made verify capitalized country code

changes made verify capitalized country code

changes made stay consistent with country code implementation

changes made to test with previous implementation

updated the django-countries version to latest

updated the tests input to match the output

updated the constants to use updated country names according to new ISO standards
 2019-12-18 18:40:48 +05:00
Hassan Javeed
596cbbdf6c Add history to CourseEntitlementSupportDetail 2019-12-17 19:10:45 +05:00
Robert Raposa
c5f44bf20e update READMEs to clarify responsibilities 
Add some clarifications for student, user_api, and user_authn given
the recent clean-up of moving code to the appropriate apps.

ARCH-1248
 2019-12-16 13:51:43 -05:00
Robert Raposa
b2be6b3ba2 Merge pull request #22513 from edx/robrap/ARCH-1253-login-user-post-only-take-3 
ARCH-1253: require POST for login_user
 2019-12-15 15:59:00 -05:00
Robert Raposa
3505492fff require POST for login_user 
ARCH-1253
 2019-12-15 11:20:06 -05:00
Feanil Patel
1411ef548c Merge branch 'master' into release-mergeback-to-master 2019-12-13 10:28:35 -05:00
uzairr
c545ed8bbe Update privacy and TOS links for edge. 
Currently,edge environment is serving empty pages against privacy
and TOS.Now, this behaviour is modified by pointing those links to
edX's privacy and TOS pages.

PROD-1066
 2019-12-13 17:39:03 +05:00
AsadAzam
a6735cd8d3 Merge pull request #22252 from edx/asad/prod-969-export-csv 
Export staff users csv
 2019-12-13 17:31:35 +05:00
asadazam93
30c8e1571e Export staff users csv 2019-12-13 16:57:01 +05:00
Diana Huang
40c98fb22b Copy list in a way that is both Py2 and Py3 compatible. 2019-12-12 12:17:56 -05:00
Feanil Patel
a8ea9844dc Deal with cache misses. 2019-12-12 11:40:59 -05:00
Diana Huang
e005c0461e Handle the caching of responses between Python 2 and Python 3. 2019-12-12 11:18:43 -05:00
Robert Raposa
d79e7df32b use login_ajax for logistration 
- use login_ajax (in place of login_session with shim) for
logistration's call to login POST
- add toggle for using login_ajax from logistration
  - FEATURES['ENABLE_LOGIN_POST_WITHOUT_SHIM']
- add custom metrics for redirect_url
- update test for third-party auth error_code

NOTE: The error_code `third-party-auth-with-no-linked-account`
was introduced in JSON in this earlier PR:
https://github.com/edx/edx-platform/pull/22452/files

ARCH-1253
 2019-12-12 10:39:49 -05:00
Zainab Amir
7eb21f4dec Change version of social-auth-app-django (#21956) 
Microsoft social login is not working on edx mobile app. The issue
is fixed in newer version of social-auth-app-django.

PROD-718
 2019-12-12 18:07:34 +05:00
Zainab Amir
3e426ccecc Suppress grade on dashboard (#22471) 
Learners should not be able to view final grade before course end
date.Suppress the grade achieved so far till course end date on
dashboard.

PROD-701
 2019-12-12 17:22:58 +05:00