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

54467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guruprasad Lakshmi Narayanan
a7bd0050a6 Log the username to help with investigating the edge cases 2020-05-20 13:07:57 +05:30
Guruprasad Lakshmi Narayanan
c739151a27 Select children again when current children don't match the selections 
This prevents errors when the current children do not match the
selected children any more.
 2020-05-20 13:07:57 +05:30
Guruprasad Lakshmi Narayanan
5a2b607ea6 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.
 2020-05-20 13:07:57 +05:30
Jeff Chaves
9189daeb58 bumping enterprise version (#24031) 2020-05-19 18:43:32 -04:00
stvn
4125ae0e23 Merge PR #24012 add/masquerade 
* Commits:
  Add is_staff check to masquerade POST
  Convert masquerade view to class-based
 2020-05-19 14:44:15 -07:00
stvn
69417396aa Add is_staff check to masquerade POST 2020-05-19 13:55:37 -07:00
stvn
5bf38f5416 Convert masquerade view to class-based 2020-05-19 13:55:37 -07:00
Ned Batchelder
9c721d78c5 Merge pull request #24026 from open-craft/kshitij/cri-174/fix-lti 
[CRI-174] [BB-2402] Fix LTI issues due to duplicated Content-Length header
 2020-05-19 16:21:02 -04:00
Dillon Dumesnil
97af77e785 Merge pull request #23902 from edx/ddumesnil/dates-external-api-AA-115 
AA-115: Adding external API for dates tab
 2020-05-19 13:01:50 -07:00
Dillon Dumesnil
7cd821b52e AA-115: Adding external API for dates tab 
This adds in the API for the Dates Tab for use by the
Course Home MFE.
 2020-05-19 12:35:43 -07:00
Kshitij Sobti
746eeb1383 Fix LTI issues due to duplicated Content-Length header 2020-05-19 23:16:42 +05:30
edX requirements bot
1d7ff32af0 Updating Python Requirements (#24024) 2020-05-19 17:42:22 +00:00
Diane Kaplan
e1c6801d85 Hide financial assistance link for two cases 2020-05-19 12:45:44 -04:00
Jeremy Bowman
47d15ff1a8 Update tested versions of Python and Django (#24006) 
Cleaned up a few more things about the testing configuration now that we've deployed Django 2.2 to production:

* Go back to a single version of django-oauth-toolkit, tox doesn't need to vary it anymore
* Go back to PyPI release of django-method-override
* Remove no longer needed dependency on python-oauth2 (we already removed the package it was used by)
* Update prepare_xdist_nodes.sh with new Django requirements file options
 2020-05-19 12:19:20 -04:00
atesker
cfff2a86aa EDUCATOR-5053 2020-05-19 12:07:05 -04:00
Jeremy Bowman
5077479959 Remove shoppingcart code from courseware index page (#23977) 
Remove code from the courseware index page that was only relevant if the shopping cart was enabled.
 2020-05-19 11:11:34 -04:00
Aura Milena Alba
04802d2d72 Remove pattern library of programs.html (#23951) 2020-05-19 09:33:24 -04:00
Uzair Rasheed
435888ce5f Merge pull request #23834 from edx/restrict-api-to-staff 
Restrict api to staff users
 2020-05-19 18:25:10 +05:00
uzairr
39b4a3f4a7 Restrict api to staff users 2020-05-19 17:22:50 +05:00
adeel khan
5e5cbd871d Merge pull request #23794 from edx/adeel/prod_1363_course_program_certificate_improvements 
Optimization
 2020-05-19 17:20:01 +05:00
Adeel Khan
3e987cfe76 Optimizing notify_credentials management command 
** This removes some of the extra
   celery calls to credential service for
   updating grade when a certificate is updated.

** This removes extra db calls
   by reusing existing queryset values.

PROD-1363
 2020-05-19 16:43:38 +05:00
edX requirements bot
4bee41773c Updating Python Requirements (#24014) 2020-05-18 09:53:02 -04:00
Ned Batchelder
68aceff860 Merge pull request #23968 from edx/nedbat/docs-progress 
Update swagger.yaml, fix some markup errors
 2020-05-16 14:50:35 -04:00
Jeff Chaves
5b42995227 make upgrade to bump edx-enterprise version (#24013) 2020-05-15 18:32:33 -04:00
Jansen Kantor
9707dcff6e EDUCATOR 5042: Learner's Private Team Appears When Learner Browses all Team Sets (#24004) 
* fix query to remove dulicates and incorrect teams
 2020-05-15 16:50:31 -04:00
Jeff Chaves
34634eb8e8 ENT-2885: importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settin… (#23999) 
importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settings following same pattern that is used for CORS_ORIGIN_WHITELIST
 2020-05-15 16:02:48 -04:00
edX requirements bot
89f691ed37 Updating Python Requirements (#24007) 2020-05-15 18:41:10 +00:00
Nick
a2b7b2689e Merge pull request #24005 from cpennington/schedule-history-PLS 
[AA-139] Record schedule updates to the history table when granting e…
 2020-05-15 11:52:40 -04:00
Tim McCormack
407ecefe70 Comment re-pinning of django-cookies-samesite (UA parsing) (#24008) 2020-05-15 15:20:35 +00:00
Dave St.Germain
45a71cfcf7 Merge pull request #24001 from edx/dcs/hide-tabs 
Only the data download tab should appear for data researchers
 2020-05-15 11:14:20 -04:00
Dave St.Germain
c6344aa577 Only the data download tab should appear for data researchers 
TNL-7222
 2020-05-15 08:11:45 -04:00
ihtram
74cbc1f4e7 Merge pull request #23965 from edx/ihtram/reverse-migration-fix 
added reverse_sql method attribute to avoid sql operation error YONK-1588
 2020-05-15 15:10:16 +05:00
stvn
0f57bff0cb Merge PR #23979 fix/courseware-api-verified-mode 
* Commits:
  Check if user can upgrade prior to showing sock upgrade
 2020-05-14 15:50:16 -07:00
stvn
51803d33ff Check if user can upgrade prior to showing sock upgrade 2020-05-14 15:09:04 -07:00
Dillon Dumesnil
86e33ee302 Merge pull request #23991 from edx/ddumesnil/dates-perf-AA-159 
AA-159: Improving performance of get_course_assignments
 2020-05-14 13:38:46 -07:00
Dillon Dumesnil
39d45eee42 Moving SUPPORTED_FIELDS for transformers into serializers 
It is only referenced inside of the serializers so we can just
define it there
 2020-05-14 13:12:43 -07:00
Dillon Dumesnil
4d4b93c6ed AA-159: Improving performance of get_course_assignments 
We saw an increase in response time with recent changes to the logic
behind get_course_assignments. This effort works to better access
the information we need in order to improve performance.
Namely, this is done by using the course_blocks_api
 2020-05-14 13:12:25 -07:00
Calen Pennington
89e0fefdfa Merge pull request #24003 from cpennington/ignore-hidden-sections-for-PLS 
Don't include staff-only sections in due date calculations for self-p…
 2020-05-14 15:58:28 -04:00
Calen Pennington
76789e5a0d [AA-139] Record schedule updates to the history table when granting extensions 2020-05-14 15:56:13 -04:00
Calen Pennington
aaa8ffdcf1 Don't include staff-only sections in due date calculations for self-paced courses 2020-05-14 15:07:48 -04:00
Adam Blackwell
c6c00d4500 Merge pull request #24002 from edx/revert-24000-timmc/unpin-samesite 
Revert "Unpin django-cookies-samesite now that it declares ua-parser dep"
 2020-05-14 13:59:10 -04:00
David Ormsbee
52b44f531d Revert "Unpin django-cookies-samesite now that it declares ua-parser dep (#24000)" 
This reverts commit 27480a25f8.
 2020-05-14 13:55:11 -04:00
Ben Warzeski
d559a35879 Update teams scss (#23989) 
highlight topic cards on tab-select
add border highlight to sorting select input on teams and topics pages.

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.local>
 2020-05-14 11:37:29 -04:00
Tim McCormack
27480a25f8 Unpin django-cookies-samesite now that it declares ua-parser dep (#24000) 2020-05-14 15:28:54 +00:00
Dave St.Germain
4b0617ab00 Merge pull request #23956 from edx/dcs/resume-api 
Added courseware API for retrieving the last completed block
 2020-05-14 11:17:12 -04:00
edX cache uploader bot
317d7b5d41 Updating Bokchoy testing database cache (#23995) 2020-05-14 10:22:45 -04:00
edX requirements bot
97139c1078 Updating Python Requirements (#23997) 2020-05-14 14:05:07 +00:00
Michael Terry
fe2ca00c48 Merge pull request #23978 from edx/mikix/highlights-dont-assume-due-dates 
Don't assume due dates on sections
 2020-05-14 09:51:46 -04:00
Michael Terry
3f2b2da22b Don't assume due dates on sections 
The content highlights code assumed due dates existed on all
sections. But we recently broke that assumption. So now we
recalculate the spread of sections across the expected duration
ourselves rather than rely on due dates.
 2020-05-14 09:26:49 -04:00
Awais Jibran
4bdb8c56b5 Merge pull request #23986 from edx/aj/improve-logging-for-capa 
Adding logs in capa_base
 2020-05-14 17:15:47 +05:00