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

54647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dillon Dumesnil
304b000b1b Merge pull request #24134 from edx/ddumesnil/dates-widget-enhancement-AA-103 
AA-103: Dates widget enhancements
 2020-06-08 06:21:44 -07:00
M. Zulqarnain
185fc3c8e0 update crowdsourcehinter to install from pypi (#24155) 2020-06-08 13:39:20 +05:00
edX Transifex Bot
2315d0a0eb fix(i18n): update translations 2020-06-07 17:55:18 -04:00
Zachary Hancock
f70ce6eb85 prevent proctoring provider changes after course start (#24146) 
* prevent proctoring provider changes after course start

* better comment wording

* add support email to error msg
 2020-06-05 13:25:12 -04:00
Aarif
7763741b0a Merge pull request #24152 from edx/openedx-chem-upgrade 
Switch the dependencies to use openedx-chem from PyPi
 2020-06-05 22:04:04 +05:00
Aarif
fe5a0cb68c Merge branch 'master' into openedx-chem-upgrade 2020-06-05 21:12:05 +05:00
Aarif
e90cf34471 ordered dependencies alphabetically as suggested 2020-06-05 19:18:24 +05:00
M. Zulqarnain
c382237c33 update django-appconf installation (#24151) 2020-06-05 19:09:58 +05:00
Michael Terry
2fbf9d1f29 Merge pull request #24154 from edx/mikix/courseware-api-marketing-url 
Add marketing_url to courseware_api
 2020-06-05 10:04:55 -04:00
Aura Milena Alba
b7a838c34b Remove pattern library of course_experience/course-updates-fragment.html. (#24062) 2020-06-05 09:54:03 -04:00
Aarif
dc2537c202 switch the dependencies to use openedx-chem from pypi 
updated the constraints order
 2020-06-05 18:50:41 +05:00
Tim McCormack
881cae6c67 Upgrade Python dependencies, including Django 2.2.13 fix (#24137) 
- Updating Python Requirements
- Fix cache key generation to use class name and module

This was stringifying the class object directly, resulting in cache keys
like `:1:<class 'xblock_django.models.XBlockConfiguration'>.xblock_django.api.deprecated_xblocks`
which then cause breakage when Django 2.2.13 validates the keys.

Co-authored-by: edX requirements bot <testeng+edx-requirements-bot@edx.org>
 2020-06-05 13:25:54 +00:00
Michael Terry
f88b4d75f0 Add marketing_url to courseware_api 
This will let the courseware MFE point at a course's marketing page.

AA-137
 2020-06-05 09:10:15 -04:00
ericfab179
d6788eb306 Remove pystache_custom dependency. (#24105) 
Remove pystache_custom dependency.
Upgrade requirements.

https://openedx.atlassian.net/browse/BOM-1670
 2020-06-05 08:49:21 -04:00
adeelehsan
54f85e10ee Merge pull request #24135 from edx/aehsan/prod-1444/reduce_completion_delay 
Completion reduce delayed
 2020-06-05 10:17:59 +05:00
Emma Green
7e3c9a7d6f Merge pull request #24143 from edx/emma-green/clean-up-get-fbe-info 
remove hacky thing to get fbe info
 2020-06-04 16:49:43 -04:00
Dillon Dumesnil
f32c51383b AA-103: Dates widget enhancements 
Reducing dates widget to one assignment. Adding link to dates
page in the dates widget
 2020-06-04 12:48:00 -06:00
Albert (AJ) St. Aubin
33b4acbe8b Merge pull request #24114 from edx/aj/MICROBA-281 
Added Python API and renamed rest_api folder
 2020-06-04 14:18:02 -04:00
Emma Green
3ab1d49997 remove hacky thing to get fbe info 2020-06-04 13:44:58 -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
adeelehsan
73e1e0934e Completion reduce delayed 
PROD-1444
 2020-06-04 17:05:53 +05:00
Zainab Amir
cdc1c91980 Integrate Video Encode Manager (#24093) 
* Add VEMPipelineIntegration config model
* Add course waffle flag to enable vem pipeline selectively

PROD-1636
 2020-06-04 11:45:34 +05:00
stvn
1bd88d61cf Merge PR #24138 fix/staff-links 
* Commits:
  Fix issue w/ staff toolbar's Insights link
 2020-06-03 16:02:54 -07:00
stvn
83b2f6e535 Fix issue w/ staff toolbar's Insights link 
since the configuration value does _not_ include the `/courses` bit in
either stage or prod.

Note: The value for prod contains a trailing slash, while stage does not
🤷

I tested locally that this should work with either config
(trailing slash or not).
 2020-06-03 15:05:06 -07:00
edX Transifex Bot
bf925bc985 geoip2: update maxmind geolite country database 2020-06-03 17:10:10 -04:00
Calen Pennington
2fba82b9e1 Merge pull request #24086 from cpennington/use-content-type-gating-in-dates-page 
Use content type gating in dates page
 2020-06-03 15:34:09 -04:00
Calen Pennington
75a39451b1 Only mark a section as containing gated content if the content is *only* available to full-access learners 2020-06-03 15:08:49 -04:00
Calen Pennington
b37be506fe Use content_type_gating to determine whether a learner has access to content on the dates page 2020-06-03 15:08:49 -04:00
David Ormsbee
ee61c9dc75 Merge pull request #20225 from open-craft/giovanni/bb-1156-enable-changing-require-build-profile 
BB-1156: Enable changing the build profile used by RequireJS
 2020-06-03 12:58:19 -04:00
Jeff LaJoie
7a45030de5 Merge pull request #24129 from edx/jlajoie/enable-highlights-job 
Enables weekly highlights job for relative dates
 2020-06-03 12:42:03 -04:00
stvn
9dd97a5c64 Merge PR #24020 add/staff-toolbar-links 
* Commits:
  Remove 'View In Studio' link from vertical
  Add Studio and Insights buttons to Instructor Toolbar
 2020-06-03 09:38:32 -07:00
Awais Qureshi
6db35274e9 Merge pull request #24116 from eduNEXT/eric/update_sorl-thumbnail_dep 
[BD-6] Update sorl-thumbnail dependency
 2020-06-03 21:32:57 +05:00
Jeff LaJoie
5e6814c442 Enables weekly highlights job for relative dates 2020-06-03 12:07:56 -04:00
Ben Warzeski
7c9f901096 Update 'create team?' prompt check in topic teams to look in teamset (#24088) 
* Update check for showing the 'create team?' prompt in topic teams to look in teamset

* fix tests and correct which collection we are checking

* eslint fixes

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-06-03 11:37:43 -04:00
Calen Pennington
d528ef8e10 Merge pull request #24133 from cpennington/use-content-type-gating-in-dates-banner 
Use content type gating in dates banner
 2020-06-03 11:29:29 -04:00
Calen Pennington
d3b11ec25b Refactor dates_banner_should_display to only return a single value, and to have a clearer set of conditions 2020-06-03 10:14:11 -04:00
Uzair Rasheed
5f47cb4bb7 Merge pull request #24107 from edx/restrict-api-to-staff-and-self-user 
Restrict cert api to staff and self user
 2020-06-03 19:13:47 +05:00
Calen Pennington
f9cfbd8593 Revert "Merge pull request #24131 from edx/revert-24085-use-content-type-gating-in-dates-banner" 
This reverts commit c3ec8b837a, reversing
changes made to 4252b14927.
 2020-06-03 09:57:22 -04:00
Calen Pennington
c3ec8b837a Merge pull request #24131 from edx/revert-24085-use-content-type-gating-in-dates-banner 
Revert "Use content type gating in dates banner"
 2020-06-03 09:55:28 -04:00
Calen Pennington
561cdab7dd Revert "Use content type gating in dates banner" 2020-06-03 09:52:24 -04:00
Calen Pennington
4252b14927 Merge pull request #24085 from cpennington/use-content-type-gating-in-dates-banner 
Use content type gating in dates banner
 2020-06-03 09:50:09 -04:00
David Ormsbee
998d38b8b1 Merge pull request #23344 from edx/ormsbee/learning_seq_api 
Learning Sequence / Course Outline API
 2020-06-03 09:45:39 -04:00
uzairr
d0f7120198 Restrict cert api to staff and self user 2020-06-03 18:12:30 +05:00
Ahtisham Shahid
b69163fae7 Merge pull request #24079 from edx/ahtisham/PROD-1412-2 
Added v2 for confirm email backward compatibility
 2020-06-03 17:13:49 +05:00
AsadAzam
8e5d9b5e55 Merge pull request #23998 from edx/asad/prod-1336 
fixed visibility state for self paced
 2020-06-03 15:17:26 +05:00
asadazam93
86d7725f26 fixed visibility state for self paced 2020-06-03 14:06:54 +05:00
Eric Herrera
816f9e6e3a Move sorl-thumbnail dependencie from github.in to base.in since PyPi version is now compatible with DJango 2.2 and python 3.5. 2020-06-02 20:15:15 -05:00
stvn
4490e4ca2b Remove 'View In Studio' link from vertical 
in favor of display in the Staff Instructor Toolbar.
 2020-06-02 16:00:33 -07:00
stvn
43ac90e30d Add Studio and Insights buttons to Instructor Toolbar 
in a feature backport from the new Courseware/Learning MFE.
 2020-06-02 16:00:32 -07:00