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

55147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff LaJoie
bf11b68fda ENT-2893: Updates header branding and href for Enterprise learners 2020-07-17 08:59:43 -04:00
Michael Roytman
0741c383ad Merge pull request #24431 from edx/mroytman/MST-286-proctored-exam-settings-rest-api 
mroytman/MST-286-proctored-exam-settings-rest-api
 2020-07-17 08:54:51 -04:00
Waheed Ahmed
8abb3d70bb Allow entitlements to be used past the enrollment date. 
Allow entitlements to be used to upgrade to verified track past the
course enrollment date and before the upgrade deadline

PROD-1497
 2020-07-17 16:22:56 +05:00
Usama Sadiq
d2253912b3 Merge pull request #24524 from edx/jenkins/upgrade-python-requirements-26157d4 
Python Requirements Update
 2020-07-17 14:07:12 +05:00
edX requirements bot
8fb817cec0 Updating Python Requirements 2020-07-17 00:46:17 -04:00
Michael Roytman
6601111982 add rest_api for contentstore app, including a proctored_exam_settings view 2020-07-16 15:52:03 -04:00
Calen Pennington
26157d43a4 Merge pull request #24484 from cpennington/fix-admin-site-size-change 
Attempt to fix devstack issues with an upgrade of django-ratelimit-ba…
 2020-07-16 14:36:37 -04:00
Calen Pennington
0e55566d96 Attempt to fix devstack issues with an upgrade of django-ratelimit-backend 2020-07-16 13:56:41 -04:00
Jeff Chaves
ffd7290609 upgrading edx-enterprise to 3.3.25 (#24516) 
* upgrading edx-enterprise to 3.3.25

* updating edx-enterprise in constraints file
 2020-07-16 12:39:23 -04:00
Awais Qureshi
d732d22b31 Merge pull request #24514 from edx/ora-2-issue 
BOM-1921
 2020-07-16 20:11:47 +05:00
Feanil Patel
e7fbc0c8e0 Merge pull request #21333 from open-craft/giovanni/bb-1471-upstream-custom-redirect 
BB-1471: Add site configuration flag to allow changing default redirection after login
 2020-07-16 10:30:07 -04:00
Awais Qureshi
d514782609 BOM-1921 
Adding constraint for ora2.
latest version causing failures.
 2020-07-16 19:17:13 +05:00
Feanil Patel
437cf0c787 Merge pull request #24432 from edly-io/ziafazal/bd-18-bockchoy-tests-removal 
[BD-18] Remove bockchoy tests
 2020-07-16 09:39:26 -04:00
M. Zulqarnain
d26b8bf47b Django 3.x deprecation warning fix in lms (#24512) 2020-07-16 18:29:09 +05:00
Christie Rice
81bcfdf1ec MICROBA-393 Add customized partner report headings (#24502) 2020-07-16 08:58:08 -04:00
Matthew Piatetsky
30c4aa3220 Merge pull request #24505 from edx/revert-24214-REV-774 
Revert "[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam"
 2020-07-16 08:38:05 -04:00
Giovanni Cimolin da Silva
8a143a4298 Add site configuration flag to allow changing redirection after login 2020-07-16 09:17:17 -03:00
adeel khan
b627e73f58 Merge pull request #24511 from edx/private_to_public_46becdc 
Mergeback PR from private to public.
 2020-07-16 15:01:57 +05:00
Usama Sadiq
c244a2a524 Merge pull request #24489 from edx/testeng/bokchoy_auto_cache_update_442c3fee11d4b1a3ec21c9904ab0e4ab12b01679 
Bokchoy Testing DB Cache update
 2020-07-16 12:45:43 +05:00
adeel khan
46becdc577 Merge pull request #181 from edx/adeel/fixing-xss-issues 
Fixes xss issues.
 2020-07-16 11:53:24 +05:00
Felipe Montoya
ca21131c98 Merge pull request #24492 from eduNEXT/eric/update_rate_xblock 
[BD-06] Update Rate XBlock version to support python 3.8.
 2020-07-15 17:08:35 -05:00
edX Transifex Bot
284c3f3637 geoip2: update maxmind geolite country database 2020-07-15 17:11:25 -04:00
Matthew Piatetsky
1fec3b997b Revert "[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam" 2020-07-15 15:43:57 -04:00
Eric Herrera
7a6a83b855 Update Rate XBlock version to support python 3.8. 2020-07-15 15:42:06 -04:00
Awais Qureshi
da845acd8f Merge pull request #24462 from eduNEXT/eric/update_acid_xblock 
[BD-6] Use updated version of acid xblock.
 2020-07-16 00:33:58 +05:00
Robert Raposa
4053bfdfbd move ENABLE_FORUM_DAILY_DIGEST default (#24483) 
The default for ENABLE_FORUM_DAILY_DIGEST continues
to be True, but this moves the default from
common.py to code.
 2020-07-15 14:48:05 -04:00
Ali Akbar
205793755f Merge pull request #24476 from edx/aakbar/PROD-1850 
removing logs, waffle flag and other older code
 2020-07-15 23:34:29 +05:00
Eric Herrera
1d7d88383e Use updated acid xblock version. 2020-07-15 14:27:37 -04:00
Feanil Patel
efef7d81ee Merge pull request #24497 from eduNEXT/lmm/codejail_py38 
[BD-6] Upgrade codejail
 2020-07-15 14:24:35 -04:00
Luis Moreno
a74b69affd Upgrade codejail 2020-07-15 14:01:24 -04:00
Dillon Dumesnil
fccb52b6c8 Merge pull request #24501 from edx/revert-24421-ora2-dates 
Revert "AA-223 - Add ORA2 dates to the dates page"
 2020-07-15 10:37:39 -07:00
Dillon Dumesnil
2601975fd3 Revert "AA-223 - Add ORA2 dates to the dates page" 2020-07-15 10:13:00 -07:00
Felipe Montoya
a0bc37866d Merge pull request #24491 from eduNEXT/eric/update_done_xblock 
[BD-6] Update Done XBlock version to support python 3.8.
 2020-07-15 11:37:04 -05:00
Nathan Sprenkle
620bbd7649 Hide search boxes in private team-sets for non-privileged users (#24444) 2020-07-15 12:30:06 -04:00
Awais Qureshi
e903e30dd4 Merge pull request #24494 from edx/BOM-1895-staticfiles-depr 
Django3.0 warnings {% load staticfiles %} is deprecated
 2020-07-15 20:46:26 +05:00
Calen Pennington
6edec4f530 Merge pull request #24421 from cpennington/ora2-dates 
AA-223 - Add ORA2 dates to the dates page
 2020-07-15 10:50:08 -04:00
Binod Pant
167d8f278f ENT-3007 : round 2 API endpoints for samlproviderconfig and samlproviderdata (#24456) 
* ENT-3007 auth/saml/v0/saml/providerdata and auth/saml/v0/saml/providerconfig endpoints

Move code to subfolder for samlproviderconfig

extra comma

undo accidental remove of import

GET works for a single config now

Use ModelViewSet to get all CRUD method. Test still fails

Add auth/saml/v0/providerdata endpoints

fixup reverse and test issue, remove leading caret

just triggering run, why is it failing in CI?

pycodelint fixes

Skip auth tests unless feature is on

Tests for post/put for samlproviderdata

move urls to their own folders

api tests for post samlprovierconfig

create 1 providerconfig test case

lint fixes

lint

lint

cleanup code local urls /samlproviderconfig works

note needed right now

Fix import errors

lint

unused import

wip: first attempt at rbac auth and jwt cookie in test

round 2 with enterprise uuid as url param for samlproviderconfig

improve tests, still dont pass

fix test by using system role, wip other test

fix create test

add get/post tests for providerdata

isort fixes

string lint fix

Cleanup based on feedback round1

move utils to tests package

Move util fn to openedx.feature area

lint

ENT-3007 : Round 2 of work on auth/saml/v0/providerconfig and auth/saml/v0/providerdata endpoints

* Fix test issue use string uuid for permission obj

* snake case changes provider_config

* snake case

* provider_data, tests and lint

* patch and delete tests for providerdata

* snake_case

* snake_case

* snake_case

* make patch test stronger

* 404 if invalid uuid for get param

* common util for validate uuid4

* unused import

* lint fixes for pycodestyle

* 400 when uuid is missing

* 400 instead of 404 for missing uuid

* spell fix

* update docstring for api usage

* docstring clarify
 2020-07-15 10:34:26 -04:00
Aura Milena Alba
1cba2a0004 [BD-10] [DEPR-65][DEPR-74] Remove pattern library of course_bookmarks.py (#24233) 2020-07-15 10:23:14 -04:00
Awais Qureshi
9e0758ffba Merge pull request #24487 from edx/BOM-1890-fixing-dj-warnings 
Django3.0 warnings fix
 2020-07-15 19:16:12 +05:00
Calen Pennington
eacfaa24b9 Make contrast for unreleased content on the dates page meet accessibility guidelines 2020-07-15 09:52:23 -04:00
Calen Pennington
d6bf54b576 Add ORA2 dates to the dates page 
ORA2 (openassessment) problems have multiple dates associated with are
not bound to the `due` date that is modified by Personalized Learner
Schedules. We expose the ORA2 dates separately in the dates page
so that learners aren't surprised by the differing deadlines.

[AA-223]
 2020-07-15 09:52:22 -04:00
JJ
9b147f5969 use class selector instead of id selector for course_dashboard_green button (#24471) 
Replaced the id selector used for tracking the course_dashboard_green button with a class selector instead, so we get eventing on each button per course on the course dashboard page.
 2020-07-15 09:50:53 -04:00
Ali-D-Akbar
8b857edd80 removing logs, waffle flag and other old data 2020-07-15 17:00:05 +05:00
Awais Qureshi
04ee889498 BOM-1895 
{% load staticfiles %} is deprecated in favor of {% load static %}.
 2020-07-15 12:49:00 +05:00
edX requirements bot
ac10f0bcaf Updating Python Requirements (#24493) 2020-07-15 11:48:30 +05:00
Eric Herrera
2bbb080187 Update Done XBlock version to support ptyhon 3.8. 2020-07-14 18:47:05 -05:00
edX cache uploader bot
f610aaac68 Updating Bokchoy testing database cache 2020-07-14 16:34:19 -04:00
Lael Birch
270d1b1a08 Merge pull request #24488 from edx/update-edx-enterprise 
Update edx-enterprise
 2020-07-14 16:25:09 -04:00
Michael Terry
f9d379203e Merge pull request #24391 from edx/mikix/assignments-complete 
AA-225: Only consider scored items for past due assignments
 2020-07-14 15:28:52 -04:00
Lael Birch
09874c0aed Update edx-enterprise 2020-07-14 15:26:40 -04:00