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

9033 Commits

Author SHA1 Message Date
Dave St.Germain
f259c91efb This upgrades XBlock, which now contains a default index_dictionary method. 2020-08-06 15:56:48 -04:00
Binod Pant
b14772055c Canvas integrated_channel from enterpise v3.4.40 (#24699) 2020-08-06 12:25:44 -04:00
Michael Roytman
2e4bfecc6c Merge pull request #24663 from edx/mroytman/MST-345-proctoring-escalation-email-empty 
mroytman/mst 345 proctoring escalation email empty
 2020-08-05 11:33:25 -04:00
Michael Roytman
5b4527097b change proctoring_escalation_email serializer to not be required and to allow null to better align with the underlying data model and use case 2020-08-04 13:16:44 -04:00
alangsto
f37161c4ee prevent changes to settings via POST (#24665) 
prevent changes to settings via POST

prevent changes to settings via POST

updated test name

updated based on feedback

removed comments
 2020-08-03 16:56:30 -04:00
Uzair Rasheed
bad3b29b6c Merge pull request #189 from edx/security-fix/fix-xss-basesite 
Fix xss in base site template
 2020-07-30 10:59:53 +05:00
Adam Butterworth
0e0c9887b1 Revert "[BD-10] [DEPR-92] Remove directories that includes pattern-library. (#24602)" 
This reverts commit e4f28debb7.
 2020-07-29 14:56:49 -04:00
David Ormsbee
7561fe751c Merge pull request #24385 from open-craft/mavidser/source-from-library-xblock 
[BD-14]"Source from Library" XBlock
 2020-07-29 12:14:48 -04:00
Aura Milena Alba
e4f28debb7 [BD-10] [DEPR-92] Remove directories that includes pattern-library. (#24602) 2020-07-28 10:21:30 -04:00
morenol
68d1c7f78c [BD-10] Remove _uses_pattern_library property from EdxFragmentViews (#24536) 2020-07-27 12:01:40 -04:00
Zachary Hancock
4e0029891f allow blank escalation email (#24613) 2020-07-27 11:59:51 -04:00
Zachary Hancock
57de9b2ac6 POST proctored exam settings (#24597) 2020-07-27 09:23:03 -04:00
edX Transifex Bot
0c51f37318 fix(i18n): update translations 2020-07-26 17:46:29 -04:00
Simon Chen
38d1df33e2 MST-334 Make sure the CSRF hooks are in INSTALLED_APPS on Studio (#24607) 2020-07-24 17:04:46 -04:00
Michael Roytman
c1ddfe29a3 Add edX Django Rest Framework Extensions CSRF App URLS to Studio 2020-07-24 14:50:16 -04:00
Simon Chen
198c4ad9a0 MST-331 Add cors header configs to CMS so it can be turned on (#24571) 
* MST-331 Add cors header configs to CMS so it can be turned on

* feedback
 2020-07-24 08:09:41 -04:00
Sid Verma
99220e0967 Add "Source from library" XBlock 
This lets the user import a block from a blockstore-based content library into a (modulestore based) course, by copying the block into the course.
 2020-07-24 13:32:37 +05:30
Sankar Raj
0cec351c0c [BD-10] [DEPR-93] Remove font reference from edx-pattern-library in styles and moved OpenSans fonts to static fonts (#24176) 2020-07-23 15:13:59 -04:00
Cory Lee
148b90358f Add Dockerfile (#23088) 
* Add Dockerfile.
* Add gunicorn config files for local development.
* Add .dockerignore file.

Co-authored-by: Joseph Mulloy <jmulloy@edx.org>
Co-authored-by: Fred Smith <derf@edx.org>
Co-authored-by: Adam Blackwell <ablackwell@edx.org>
Co-authored-by: Kyle McCormick <kmccormick@edx.org>
Co-authored-by: Nadeem Shahzad <nshahzad@edx.org>
 2020-07-22 17:45:23 -04:00
Uzair Rasheed
03835a51f3 Merge pull request #170 from edx/azarembok/cert-fix 
PROD-1236: Do not expose user id with certificate URL.
 2020-07-22 16:35:49 +05:00
Ali Akbar
b7fdee226b Merge pull request #185 from edx/sustaining/security-fixes 
Sustaining Xsslint security fixes
 2020-07-22 13:56:54 +05:00
uzairr
4e94304c8c Fix xss in base site template 2020-07-22 02:19:05 +05:00
Andytr1
af072a5158 EDUCATOR-5039 (#24546) 
* EDUCATOR-5039

* EDUCATOR-5039 - pr updates
 2020-07-21 13:36:18 -04:00
Zachary Hancock
c9f5ec3397 disable escalation email requirement (#24551) 2020-07-21 09:45:25 -04:00
Ahmad Bilal Khalid
71bbd9a5ec Fix failing non-indexable tests 2020-07-20 12:06:42 +05:00
edX Transifex Bot
d0b138479f fix(i18n): update translations 2020-07-19 17:36:28 -04:00
uzairr
fb9ba90efe PROD-1236: Do not expose user id with certificate URL. 2020-07-17 22:59:34 +05: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
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
0e55566d96 Attempt to fix devstack issues with an upgrade of django-ratelimit-backend 2020-07-16 13:56:41 -04:00
Ali-D-Akbar
f1d99e1d61 PROD-1795 2020-07-15 10:48:41 +05:00
SaadYousaf
188aae9402 PROD-1665 2020-07-15 10:48:41 +05:00
alangsto
7ea9714a33 Updated URLs to course-authoring MFE (#24468) 
* updated urls to course-authoring MFE

* updates for requested changes

* updated for pylint errors
 2020-07-13 16:10:48 -04:00
Sid Verma
c609451d2e [BD-14] Limit number of blocks allowed in content libraries (#24276) 
* Enforce limit on number of blocks allowed in library (blockstore)

* Enforce limit on number of blocks allowed in library (modulestore)

* Changes from review feedback
 2020-07-13 15:49:47 -04:00
SaadYousaf
015aa98a38 PROD-1661 2020-07-10 19:11:30 +05:00
alangsto
90d6b18711 Add link to exam settings page from studio (#24405) 
* testing

* updates to drop down

* unit tests. env changes were copied based on other MFEs in LMS

* added exam settings link to other course settings pages

* fixed pylint errors

* updates for requested changes

* updates for requested changes, as well as changes for xss linter
 2020-07-09 10:13:18 -04:00
Robert Raposa
77e490f057 ARCHBOM-1305: remove deprecated flag_undefined_default (#24426) 
This is the final step in removing the deprecated
flag_undefined_default as explained by the following ADR:
https://github.com/edx/edx-platform/blob/master/openedx/core/djangoapps/waffle_utils/docs/decisions/0001-refactor-waffle-flag-default.rst

Notes:

* All uses of flag_undefined_default=False were always
  supposed to have been no-ops.
* All uses of flag_undefined_default=True that are removed
  in this PR have been replaced by migrations in past PRs.
* The temporary metric temp_flag_default_used id no longer
  reporting any data.

ARCHBOM-1305
 2020-07-09 09:31:31 -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
Waheed Ahmed
a6a69224d1 Ratelimit login_user endpoint. 
Ratelimited `login_user` endpoint using `django-ratelimit`, also
decreased default value of logistration rate limit to 100 requests
per five minutes per IP.

PROD-1877
 2020-07-08 15:36:11 +05:00
Saleem Latif
300d361de4 Fixed COURSE_CATALOG_URL_ROOT attribute error for studio 2020-07-01 15:27:37 +05:00
stvn
65db925948 Add Studio warning for deprecated course keys 
in preparation of dropping support for them entirely.

Re: timing: We will _not_ be going live with this on edx.org at launch;
we'll override this setting on our own installs, initially.

We do, however, want to get this merged ASAP, so that it can still be
pulled into Juniper. That will allow us to drop support in time for the
Koa Named Release, while still providing community operators with a full
Named Release cycle to handle deprecation on their installations.

References:
- [0] TNL-7097
 2020-06-30 12:26:53 -07:00
Waheed Ahmed
cb8556bfa6 Merge pull request #182 from edx/aehsan/fix_xss_linting_issues 
fixed xss linting issues
 2020-06-30 19:30:25 +05:00
edX Transifex Bot
ce9d22254b fix(i18n): update translations 2020-06-28 17:45:57 -04:00
Aarif
9e34cb3df9 Removed deprecated future imports (#24295) 2020-06-28 23:40:03 +05:00
Zainab Amir
0b80987ba0 Add vem_enabled_courses_percentage (#24294) 
Add a field to VEM config model that will decide the percentage of
courses allowed to go to VEM pipeline. The courses that don't meet the
criteria will go to VEDA.

PROD-1722
 2020-06-26 14:30:42 +05:00
Awais Qureshi
bbe9d19c01 BOM-1811 
assert_has_calls() has different order of specified calls.
if any_order is true then the calls can be in any order,
but they must all appear in mock_calls.

https://docs.python.org/3/library/unittest.mock.html#unittest.mock.Mock.assert_has_calls
 2020-06-25 22:04:48 +05:00
adeelehsan
c127706ee7 Fixed XSS issues in xblock.js. 
PROD-1660
PROD-1662
 2020-06-25 14:09:20 +05:00
Zachary Hancock
bcc1ddd375 add proctoring escalation contact setting (#24243) 2020-06-24 16:02:17 -04:00
Michael Roytman
e5f298e158 Change validation code to use the value of the proctoring_provider model when making a comparison instead of the entire model. Otherwise, the condition 'current_provider != requested_provider' always resolves to True. 2020-06-23 18:49:28 -04:00
Robert Raposa
9b0024376a update flags using flag_undefined_default=True 
In order to enable us to remove flag_undefined_default, this
updates flags according to alternatives documented in:
https://github.com/edx/edx-platform/blob/master/openedx/core/djangoapps/waffle_utils/docs/decisions/0001-refactor-waffle-flag-default.rst

These flags were updated with a migration:
- enable_checklists_quality
- REJECTED_EXAM_OVERRIDES_GRADE
- ENFORCE_FREEZE_GRADE_AFTER_COURSE_END
- WRITABLE_GRADEBOOK

ARCHBOM-1304
 2020-06-23 14:37:50 -04:00