Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

19803 Commits

Author SHA1 Message Date
edX cache uploader bot
5bd0d317ac Updating Bokchoy testing database cache (#24304) 2020-06-23 20:15:57 +00:00
Nick
e8fc653c86 Merge pull request #24285 from edx/ndalfonso/AA-142-calendar-sync-ses 
AA-142 calendar sync ses
 2020-06-23 13:52:42 -04:00
Nicholas D'Alfonso
5b1d181491 AA-142 calendar sync ses 
- set up util function to use Amazon SES for sending calendar
  sync emails.
- remove old sailthru code which we originally implemented for
  this functionality
- include ADR on our decision to use SES instead of Sailthru.
 2020-06-23 12:14:03 -04:00
Matthew Piatetsky
b3c2d37dcc Merge pull request #24214 from edx/REV-774 
[REV-774] Show content type gating upsell when a limited access learner tries to access a timed exam
 2020-06-23 11:48:31 -04:00
Luis Moreno
1d557616b1 Fix test for python3.8 2020-06-23 10:16:37 -04:00
Aarif
27480cdd2f Removed deprecated future imports 2020-06-23 18:51:43 +05:00
Matthew Piatetsky
78317ca115 Show content type gating upsell when a limited access learner tries to access a timed exam 
Otherwise, these learners could start the timer and then be unable to take the exam once they have access to the content
REV-774
 2020-06-22 16:18:58 -04:00
leomartinez2019
943bd6f15b Fixing cgi.escape DeprecationWarning 
- Change cgi.escape to html.escape

- Add quote=False to html.escape

- Use function HTML() to address python-wrap-html warning
 2020-06-22 14:41:27 -04:00
Awais Qureshi
576ad48dbd Merge pull request #24274 from eduNEXT/eric/py38_dict_insertion_order 
[BD-6] Update dicts order to fix tests
 2020-06-22 20:10:49 +05:00
edX cache uploader bot
98ebb2df44 Updating Bokchoy testing database cache (#24269) 2020-06-22 09:02:48 -04:00
Eric Herrera
3cdd5c4d27 Change some tests dict order to fix assertion after python 3.7 change of preserving insertion order in dicts. 2020-06-21 09:32:34 -05:00
Michael Roytman
361a2c92b3 Merge pull request #24266 from edx/mroytman/course-fields-exclude-list 
rename blacklist/whitelist to exclude list/include list in Course Met…
 2020-06-19 16:42:10 -04:00
Michael Roytman
6a21cd3f91 rename blacklist/whitelist to exclude list/include list in Course Metadata class 2020-06-19 14:33:41 -04:00
David Ormsbee
e69a5fce56 Merge pull request #24220 from open-craft/samuel/fix-youtube-metadata-api 
SE-2634 Fix crashes in yt_video_metadata
 2020-06-19 12:24:28 -04:00
David Ormsbee
0b4cf7e06c Merge pull request #23039 from open-craft/samuel/fix-unescaped-selector 
SE-2176 Fix elem not selected if id contains special chars
 2020-06-19 12:13:20 -04:00
edX cache uploader bot
fa5b0ade5c Updating Bokchoy testing database cache (#24261) 2020-06-19 14:08:17 +00:00
Michael Terry
d325943fe5 Merge pull request #24169 from edx/mikix/celebration 
AA-137: Support courseware celebrations
 2020-06-18 10:49:36 -04:00
Aura Milena Alba
078dcc4296 Remove use pattern library of EdxFragmentView and discussion/maintenance_fragment. (#24029) 2020-06-18 09:10:18 -04:00
Awais Qureshi
975352b08a Merge pull request #24240 from eduNEXT/lmm/re_py38 
[BD-6] Fix python 3.8 compatibility
 2020-06-18 16:51:19 +05:00
edX Transifex Bot
04b3a2ce1a geoip2: update maxmind geolite country database 2020-06-17 17:00:36 -04:00
Luis Moreno
398a8a2b23 Fix python 3.8 compatibility 2020-06-17 16:08:20 -04:00
Michael Terry
450072582e AA-137: Support courseware celebrations 
- Add a new CourseEnrollmentCelebration model, which ties a
  course enrollment to some booleans about progress celebrations
- Add serialization of the new model to the existing courseware_api
  app's existing course info view
- Add new API in courseware_api to update a celebration model
 2020-06-16 15:19:21 -04:00
Samuel Walladge
43f0cd72af Merge remote-tracking branch 'origin/master' into samuel/fix-unescaped-selector 2020-06-16 09:52:38 +09:30
Matt Tuchfarber
7edac4e4b2 Revert "Add demographics prompt to edx.org theme" 2020-06-15 14:54:54 -04:00
Samuel Walladge
4da0c64cc3 Fix crashes in yt_video_metadata 
- yt_video_metadata returned a generic non-json-api-friendly 500 error
  when called on a non-youtube video
- load_metadata_from_youtube was crashing when called from the xblock
  yt_video_metadata endpoint. It passes a webob request, which has a
  different api for retrieving the http referer.
 2020-06-15 17:29:57 +09:30
Matt Tuchfarber
b7cf7808b8 Add demographics prompt to edx.org theme 
- Add bootstrap utility function to lms-base-v1 CSS
- Moved coaching sass to edx.org theme
- Banner feature flag and MB program gated
 2020-06-12 10:58:37 -04:00
edX Transifex Bot
6cc5474dba geoip2: update maxmind geolite country database 2020-06-10 17:15:21 -04:00
Calen Pennington
c6695e0b6f Only actually reset user schedule if they have missed deadlines and not missed any gated content deadlines 2020-06-10 15:18:53 -04:00
Jeremy Bowman
a36332858d Remove bok-choy shoppingcart tests DEPR-43 (#24182) 
Removed the FakePaymentPage page object which used shoppingcart app functionality, as well as everything that depended on it. I checked the e2e test repo also, and it doesn't seem to need any of the removed code.
 2020-06-10 14:13:40 -04:00
Adeel Khan
2383fb3fa6 Improving user locked out logic. 
This patch improves on the user locked
out logic by providing a helping message
near locked out. This would help reduce
retries by giving user the option to use
password reset flow to fix the issue.

PROD-1505
 2020-06-09 09:36:42 +05:00
David Ormsbee
4f3a45f444 Revert "[BB-112] Fix the unpredictable order randomization issue with randomized content blocks" 2020-06-08 16:47:35 -04:00
edX cache uploader bot
35cf1b6ea0 Updating Bokchoy testing database cache (#24139) 2020-06-08 15:55:37 -04:00
David Ormsbee
d507a5cd99 Merge pull request #23265 from open-craft/guruprasad/BB-112-fix-randomized-content-block-order 
[BB-112] Fix the unpredictable order randomization issue with randomized content blocks
 2020-06-08 10:11:48 -04:00
Albert (AJ) St. Aubin
e91c837173 Added Python API and renamed rest_api folder 
[MICROBA-281]
 2020-06-04 12:44:06 -04:00
edX Transifex Bot
bf925bc985 geoip2: update maxmind geolite country database 2020-06-03 17:10:10 -04:00
edX cache uploader bot
a976a71623 Updating Bokchoy testing database cache (#24076) 2020-06-01 12:19:26 -04:00
Feanil Patel
a88da3b5cd Merge pull request #24089 from edx/feanil/improve_import_error_logging 
Log what thing we failed to import.
 2020-05-29 15:52:45 -04:00
Feanil Patel
c15fae3564 Log what thing we failed to import. 
This should help more quickly narrow down where things are failing on an import.
 2020-05-29 13:24:10 -04:00
Dillon Dumesnil
3d69046147 Merge pull request #24069 from edx/ddumesnil/fix-lti-icon-AA-167 
AA-167: Making the LTI icon class dynamic
 2020-05-28 08:19:40 -07:00
Dillon Dumesnil
826d5fe3da AA-167: Making the LTI icon class dynamic 
We will now show the problem icon if the LTI problem
is scored and 'other' if it is not.
 2020-05-28 07:18:18 -07:00
edX Transifex Bot
aabe616828 geoip2: update maxmind geolite country database 2020-05-27 17:04:54 -04:00
Calen Pennington
fc21a337aa Use a fixed time for course duration limits, so that schedule extensions don't extend FBE duration limits 2020-05-26 16:29:28 -04:00
Feanil Patel
72ea1b7d4f Revert "Increase requests limit for logistration rate limit." 
This reverts commit a1c018823d.
 2020-05-21 11:40:47 -04:00
Waheed Ahmed
a1c018823d Increase requests limit for logistration rate limit. 2020-05-21 17:05:19 +05:00
Waheed Ahmed
c7f4e16470 Fix XSS lint issues for course_cta_text 
PROD-1602
 2020-05-21 12:51:07 +05:00
edX Transifex Bot
ead8e35b5e geoip2: update maxmind geolite country database 2020-05-20 16:59:46 -04:00
Ahtisham Shahid
1e103b2fdd Merge pull request #23996 from edx/ahtisham/PROD-1540 
Fixed Import error due to pre tag
 2020-05-20 21:56:34 +05:00
Ben Warzeski
1703a88d46 remove old_format from team config tests (#24010) 
* remove old_format from team config tests

* remove old format from teams_config

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-05-20 08:56:46 -04:00
Ahtisham Shahid
4f5496f02c Fixed Import error due to pre tag 
Fixed regex for nested pre tags

Updated import export test

fixed quality test issue

fixed No exception type(s) specified

updated tests

fixed linter issue

fixed linter issue

fixed linter issue
 2020-05-20 13:17:53 +05:00
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