Commit Graph

18207 Commits

Author SHA1 Message Date
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
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
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
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
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
Ali-D-Akbar
8b857edd80 removing logs, waffle flag and other old data 2020-07-15 17:00:05 +05:00
edX cache uploader bot
f610aaac68 Updating Bokchoy testing database cache 2020-07-14 16:34:19 -04:00
Michael Terry
939f268da8 AA-225: Only consider scored items for past due assignments
When considering if an assignment is past due for the dates tab,
only look at the scored and graded units in the subsection (i.e.
ignore reading and video units).

This still leaves the "complete" field alone -- i.e. those
subsections will still be left incomplete generally. But for
assignment-focused tasks, they will instead be considered complete.
2020-07-14 15:04:19 -04:00
Lael Birch
3c8630bdf4 Update edx-enterprise requirement
Unskip a test that the new version fixes
2020-07-14 09:53:07 -04:00
taliaedX
74730ef7c9 Merge pull request #24439 from edx/trhodes/07092020requirements_bump
update to new edx-enterprise version
2020-07-13 10:22:34 -04:00
Talia
34f8954145 update to new edx-enterprise version 2020-07-10 14:59:33 -04:00
David Ormsbee
3b6965599c Merge pull request #23910 from open-craft/samuel/fix-get-video-subs
SE-2589 fix AttributeError: 'LibraryLocatorV2' object has no attribute 'make_asset_key'
2020-07-10 14:59:30 -04:00
Feanil Patel
ec2369d88f Merge pull request #24453 from edx/revert-24298-bpant/ENT-3007-api-endpoints-for-samlprovider
Revert "ENT-3007 : Add auth/saml/v0/providerconfig|data CRUD endpoints for use in admin portal"
2020-07-10 14:36:30 -04:00
David Ormsbee
4fc481909e Merge pull request #24218 from open-craft/symbolist/word-cloud-block
[BD-4] Convert WordCloud XModule into WordCloud XBlock. [SE-2722]
2020-07-10 13:39:27 -04:00
Feanil Patel
5470ce5805 Revert "ENT-3007 : Add auth/saml/v0/providerconfig|data CRUD endpoints for use in admin portal (#24298)"
This reverts commit 96ddcdc288.
2020-07-10 13:38:30 -04:00
Binod Pant
96ddcdc288 ENT-3007 : Add auth/saml/v0/providerconfig|data CRUD endpoints for use in admin portal (#24298)
* Add auth/samlproviderconfig CRUD endpoints for use in admin portal

Fixes: ENT-3007

* 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

* lint fix

* remove unused import
2020-07-10 11:23:13 -04:00
Feanil Patel
4ac2c5e92b Correct logic on building marketing links.
The logic used to has a special case for edge in the hostname which
didn't really make sense. So instead we just check to see if the given
url starts with http and if it does we return it directly.  If it doesn't,
then we try to convert it to a valid url and return that.  If that fails
we return .

Add a new custom metric `unresolved_marketing_link` to track when we
run into this scenario.
2020-07-09 15:09:38 -04:00
Feanil Patel
39dcd80211 Merge pull request #24428 from edx/feanil/404-on-not-found
If this reverse failed, it was throwing a 500.
2020-07-09 09:57:21 -04:00
edX Transifex Bot
542b33e1e0 geoip2: update maxmind geolite country database 2020-07-09 14:27:06 +05:00
Usman Khalid
4cc0f30db7 Convert WordCloudDescriptor and WordCloudModule into WordCloudBlock. 2020-07-09 09:46:54 +05:00
Feanil Patel
b6fdad2ea4 If this reverse failed, it was throwing a 500.
Catch the 500 in this case and throw a 404 instead.
2020-07-08 15:56:53 -04:00
Awais Qureshi
57f628a847 Merge pull request #24415 from edx/testeng/bokchoy_auto_cache_update_bac4b8ed6fb3d1273f95cf244f6242b76f73731e
Bokchoy Testing DB Cache update
2020-07-08 19:51:25 +05:00
Feanil Patel
e8a7529243 Merge pull request #24414 from edx/feanil/shoppingcart-remove-student-transfer-command-refs
DEPR-43 Remove shoppingcart certs refs.
2020-07-08 09:30:50 -04:00
Waheed Ahmed
4f80fd6540 Improve password reset rate limit.
Used django-ratelimit instead of django-ratelimit-backend
to configure two different rate limit configurations for same
endpoint.

PROD-1708
2020-07-08 16:19:07 +05:00
edX cache uploader bot
50a81db551 Updating Bokchoy testing database cache 2020-07-07 17:01:52 -04:00
Feanil Patel
20687f9548 DEPR-43 Remove shoppingcart certs refs.
There's a chance that the whole management command should be removed since we
don't do change modes with the command anymore but that's a different problem
for a different day I think.
2020-07-07 16:54:21 -04:00
Ali-D-Akbar
b2755a35a0 optimize course enrollment count query 2020-07-06 12:47:46 +05:00
Samuel Walladge
34516b9660 Consolidate get_transcript methods
There were two get_transcript methods. The broken one that was being
used (VideoTranscriptsMixin.get_transcript) is stripped out here - it
has been superseded by transcripts_utils.get_transcript. The latter
includes support for blockstore and VAL, while the former did not.

This fixes the `AttributeError: 'LibraryLocatorV2' object has no
attribute 'make_asset_key'` error seen when attempting to load a
transcript from a video through the xblock api when the video had the
transcript stored in blockstore.

Note that if you were previously using video.get_transcript, you should
now use `transcripts_utils.get_transcript(video, ...)`, and note that
the returned 'filename' will be prefixed with the language code, as
other `get_transcript*` functions already do.
2020-07-03 08:20:55 +09:30
Michael Terry
c9c548a550 Merge pull request #24365 from edx/ddumesnil/AA-220
AA-220: Making Library Content an Aggregator CompletionMode
2020-07-02 10:57:01 -04:00
edX cache uploader bot
691649362e Updating Bokchoy testing database cache (#24374) 2020-07-02 09:51:28 -04:00
Dillon Dumesnil
35549f56ba AA-220: Making Library Content an Aggregator CompletionMode
This change will prevent Library Content from being marked as
complete on view and the corresponding version bump to
edx-completion contains code that will start looking at the
children of the library content for completeness.
2020-07-01 17:33:54 -04:00
edX Transifex Bot
cb0973317e geoip2: update maxmind geolite country database 2020-07-01 17:16:01 -04:00
Michael Terry
3030efec78 AA-177: Add masquerading for course home MFE
- Looks at masquerading config for dates, outline, metadata, and
  celebration APIs in course_home_api / courseware_api.
- Consolidates and cleans up places we check whether masquerading
  gives us full access to a course.
2020-06-29 12:37:47 -04:00
edX cache uploader bot
7bfbd3104e Updating Bokchoy testing database cache (#24334) 2020-06-29 13:58:42 +00:00
Aarif
9e34cb3df9 Removed deprecated future imports (#24295) 2020-06-28 23:40:03 +05:00
Danial Malik
c962423bbc Replace track calls with eventtracking in task_track and server_track (#24282)
* Replace track calls with eventtracking in task_track and server_track

* Making  events compatible with events emitted via track app

* Fixed broken tests and quality violation

* Removed useless changes in shim. using  in  to have  and  keys in event context

Co-authored-by: zia.fazal@arbisoft.com <zia.fazal@arbisoft.com>
2020-06-26 13:49:16 -04:00
Matt Tuchfarber
4f1cd91113 Re-Add demographics prompt to edx.org theme (#24231)
- Add bootstrap utility function to lms-base-v1 CSS
- Moved coaching sass to edx.org theme
- Banner feature flag and MB program gated
- Fixes previous issue of changes specificity in button selector by
  resetting the style inside the component's class
2020-06-25 14:47:08 -04:00
Diana Huang
8a1fad8c12 Merge pull request #24181 from edx/diana/dashboard-courses-blocked
DEPR-43: Remove usage of CourseRegistrationCode and blocked courses from
2020-06-25 13:59:26 -04:00
Awais Qureshi
05b98cbba2 Merge pull request #24297 from eduNEXT/lmm/try_to_fix_migration_problem
[BD-6] Attempt to fix db sync problem for python3.8
2020-06-25 20:29:29 +05:00
Zachary Hancock
bcc1ddd375 add proctoring escalation contact setting (#24243) 2020-06-24 16:02:17 -04:00
Awais Qureshi
af3691ed52 Merge pull request #24311 from eduNEXT/eric/bom-1748
[BD-6] Order VideoBlock html metadata alphabeticallly to fix test.
2020-06-24 22:31:36 +05:00
Dillon Dumesnil
a7dff8c21e Merge pull request #24303 from edx/ddumesnil/due-dates-in-courseware-AA-44
AA-44: Adding due dates into courseware
2020-06-24 09:22:01 -07:00
Luis Moreno
ba297ab16c Solve quality issues 2020-06-24 12:10:09 -04:00
Eric Herrera
c40aa67fd0 Order VideoBlock html metadata alphabeticallly to fix test. 2020-06-24 12:07:55 -04:00
Luis Moreno
5fe377cc77 Attempt to fix db sync problem for python3.8 2020-06-24 11:58:23 -04:00
morenol
8c53fa4a47 async is a keyword in python>=3.7 (#24265)
the new keyword async is causing errors when we run this with python 3.8.
https://docs.python.org/3/whatsnew/3.7.html

I tried in the first place, to change the definition of that value in the place where the context is defined, but it seems that it is taken from https://github.com/jazzband/django-pipeline,

This solves many problems for lms and cms tests that were making the jenkins workers get timeout.

That template have not seen changed since 2012, so I had to do additional changes in the templates in order to pass the xsslint checks:

mako-missing-default
mako-invalid-html-filter

I am not sure about the remove of the safe filter.

But I didn't found information about the 'safe' filter. It is probably that the now default 'h' filter is enough.
2020-06-24 11:55:03 -04:00
Dillon Dumesnil
7f6a2518cb AA-44: Adding due dates into courseware
Due dates will only display for graded subsections.
If the assignment has already been completed, there will be a pill
to indicate that. If the assignment is past due, there will be a
pill. If it is upcoming, there are no pills
2020-06-24 08:26:52 -07:00
Diana Huang
6aa300711b Remove usage of CourseRegistrationCode and blocked courses from
dashboard.
2020-06-24 09:38:20 -04:00
M. Zulqarnain
39b109a9ad Fixed bad escape character (#24316)
As of Python 3.7, a backslash-character pair that is not a valid escape sequence now generates an error, earlier it was a deprecation warning.
2020-06-24 18:23:11 +05:00