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

54083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jansen Kantor
72f6a3c2a9 bump proctoring ver (#23332) 2020-03-06 11:58:26 -05:00
David Ormsbee
be1d3a98f7 Merge pull request #23317 from edx/ormsbee/courseware_mfe_button_visibility 
Show MFE preview to course staff (if waffle set)
 2020-03-06 11:58:08 -05:00
Tim McCormack
a783690507 Fix the way we launch celery (needs pointer to celery app, not env file) (#23325) 
This is a fix to PR #23222.
 2020-03-06 16:08:05 +00:00
Diana Huang
f3eb0d2e61 Switch to django-celery upstream and make upgrade. 2020-03-06 11:05:19 -05:00
David Ormsbee
767f16d795 Fix nested sequence display in Courseware MFE 
Check to make sure that "activate_block_id" is actually a Unit
(VerticalBlock) before using it to build a link to the Courseware
MFE. We were previously sending sequence block keys here, causing
the MFE to render a whole sequence where only a unit was desired.

Fixes TNL-7115
 2020-03-06 11:01:28 -05:00
David Ormsbee
979906275c Show Courseware MFE link to course staff. 
Show a link the courseware MFE to course staff if the
ENABLE_COURSEWARE_MICROFRONTEND feature is enabled and the
REDIRECT_TO_COURSEWARE_MICROFRONTEND CourseWaffleFlag is active
for that course. Previously only global staff could see this link.

This commit also adds ENABLE_COURSEWARE_MICROFRONTEND to
lms/envs/common.py and makes this value True by default on
devstack, since that front end application should soon be part
of devstack: https://github.com/edx/devstack/pull/484

Related to TNL-6982 and TNL-7045.
 2020-03-06 11:00:22 -05:00
Dillon Dumesnil
0c2dfd136e Merge pull request #23321 from edx/ddumesnil/AA-55 
AA-55: Updating edx-when version
 2020-03-06 10:51:21 -05:00
Matt Tuchfarber
47255197e1 Allow plugins to update contexts in specific views 
Instead of requiring views like the dashboard to know about plugins so
they can include their data in the context, this allows plugins to
define a mapping between a view and a function where the function
returns a dictionary of new context for the view. Each view would have
to purposefully enable this additional context before it could be used.
This will allow new content to be added to the pages without updating
the core with a combination of a plugin to add new context, and a theme
override of that page to use the new context.
 2020-03-06 10:47:52 -05:00
Dillon Dumesnil
7e918d2efb AA-55: Updating edx-when version 2020-03-06 10:03:34 -05:00
Feanil Patel
1134f69811 Merge pull request #23328 from edx/jenkins/upgrade-python-requirements-2e619e0 
Python Requirements Update
 2020-03-06 10:02:18 -05:00
edX requirements bot
37bc473757 Updating Python Requirements 2020-03-06 09:35:03 -05:00
usamasadiq
c7680e4ebb Updated shortuuid==1.0.1 2020-03-06 17:07:08 +05:00
usamasadiq
2cdc2e0d71 Removed unused commit_on_success decorator and its tests 2020-03-06 16:21:28 +05:00
Awais Jibran
c547af074f Remove unessary logs 2020-03-06 12:16:03 +05:00
Michael Terry
2e619e0722 Merge pull request #23319 from edx/mikix/flip-flag 
Use relative dates flag for dates widget v2
 2020-03-05 17:03:36 -05:00
Tim McCormack
11fc118402 Remove django-celery from transitive deps; remove unused tasks (#23318) 
The video thumbnail and transcript tasks were the only things using chord_task from
edx-celeryutils, which in turn was blocking django-celery removal. But, they're no longer used.

Co-authored-by: Diana Huang <diana.k.huang@gmail.com>
 2020-03-05 21:57:12 +00:00
Michael Terry
24aaebdfa5 Use relative dates flag for dates widget v2 
Switch from a separate waffle flag for the dates widget v2 work
and just use the relative dates experiment flag instead.
 2020-03-05 16:38:07 -05:00
Jansen Kantor
919dc5760a EDUCATOR-4918: Hide teams listing for team-sets with privacy enabled (#23293) 
* pass teamset type existence flags to the teams tab view
 2020-03-05 14:40:26 -05:00
Calen Pennington
667d7606ee Merge pull request #23305 from cpennington/upgrade-edx-when 
Upgrade edx when
 2020-03-05 14:24:23 -05:00
Calen Pennington
fbd7507af5 Only --rebuild on the first call to pip-compile 2020-03-05 14:00:16 -05:00
Calen Pennington
5462c66eb5 Upgrade edx-when to 1.0.4 to fix query performance issues 2020-03-05 14:00:16 -05:00
atesker
f26ffb453b EDUCATOR-4943 - update error message 
EDUCATOR-4943 - update error message. cr1

EDUCATOR-4943 - update error message. cr2

unit tests

readability
 2020-03-05 12:32:39 -05:00
Troy Sankey
5395a5e9f8 Merge pull request #23306 from edx/pwnage101/deng-18-rename_site_configuration_siteconfiguration_values_2.3 
Revert "Revert "Rename values in SiteConfiguration (2/3) attempt #2""  (attempt #3)
 2020-03-05 09:35:48 -05:00
Dave St.Germain
db1b88611c Merge pull request #22258 from open-craft/content-library-permissions 
Detailed Permissions for Content Libraries
 2020-03-05 09:07:40 -05:00
Ahtisham Shahid
6904e1c7db Merge pull request #23298 from edx/ahtisham/PROD-1326 
created logs to capture capa problem errors
 2020-03-05 16:58:01 +05:00
Jeremy Bowman
99dda2a7e8 Updating Bokchoy testing database cache (#23307) 2020-03-05 06:20:06 -05:00
Ahtisham Shahid
4efcfca34a created logs to capture capa problem errors 
Update logs

updated logger
 2020-03-05 12:54:04 +05:00
David Joy
1da7fc425f Merge pull request #19283 from open-craft/frank/expand-subsection-when-anchored 
[BB-527] expand subsections when the url anchor points to them.
 2020-03-04 16:53:12 -05:00
Nick
0df2debd5b Merge pull request #23283 from edx/ndalfonso/AA-12-reset-deadlines 
AA-12 reset self paced due dates
 2020-03-04 15:42:46 -05:00
Calen Pennington
95ba1b6e88 Merge pull request #23301 from cpennington/install-schedules-app 
Schedules is a core part of the LMS, install it by default, rather th…
 2020-03-04 15:26:09 -05:00
Nicholas D'Alfonso
be3b150621 AA-12 reset self paced due dates 
- for self paced courses, if a sequential's due date has passed
  and it is incomplete, allow the user to reset the start_date
  for the related schedule to now, thus shifting all due dates
  for all sequentials within the course by the pre determined
  due date offset.
- add historical table to the Schedule model.
 2020-03-04 15:13:46 -05:00
Feanil Patel
8114fa09f8 Update shard assignments for bokchoy. (#23300) 2020-03-04 15:06:54 -05:00
Troy Sankey
d428f7530d Revert "Revert "Rename values in SiteConfiguration (2/3) attempt #2"" 
This reverts commit e6f58b6d4c.

This is our third (3rd!) attempt to deploy stage 2 of this column rename.
 2020-03-04 14:53:47 -05:00
Manjinder Singh
8592109a2a Removed OPENID settings (#23299) 
Part of removal of OpenID Connect
 2020-03-04 14:52:00 -05:00
Jeremy Bowman
47d6d7e526 Updating Bokchoy testing database cache (#23304) 2020-03-04 13:17:38 -05:00
Kyle McCormick
9195c86dbe Delete my pull request template (#23303) 
The PR template that I added a few months ago
doesn't seem to be adding any value to platform PRs.
 2020-03-04 11:53:25 -05:00
Robert Raposa
ae224b9a5b Merge pull request #23302 from edx/robrap/BOM-1324-delete-enable-scopes-switch 
BOM-1324: delete oauth2.enforce_jwt_scopes waffle switch
 2020-03-04 11:48:17 -05:00
Calen Pennington
a8ba43133f Remove schedules plugin from cms.djangoapps listing 2020-03-04 11:27:07 -05:00
Robert Raposa
d28889db1a delete oauth2.enforce_jwt_scopes waffle switch 
The code for this switch was removed in:
https://github.com/edx/edx-platform/pull/23188

BOM-1324
 2020-03-04 10:56:52 -05:00
Calen Pennington
d853444229 Schedules is a core part of the LMS, install it by default, rather than through the plugins mechanism 2020-03-04 10:52:17 -05:00
Alex Dusenbery
ff1d9fe384 Upgrade ORA to 2.6.17 | Small logging change. 2020-03-04 10:41:21 -05:00
Manjinder Singh
7d2ff9cd3f Removing all settings that have OIDC in name (#23251) 
* Removing all settings that have OIDC in name

* Removing ENABLE_DOP_ADAPTER

* changes JWT_ISSUER value in devstack
 2020-03-04 09:06:29 -05:00
Awais Jibran
44199c3f72 Workaround the error in find_question_label. (#23247) 
* Workaround the error in find_question_label.

This is a temporary log, which will give us information and unblock the course team.
PROD-1326

* raise exception after logging it.
 2020-03-04 17:55:35 +05:00
Ahtisham Shahid
318e9167d1 Merge pull request #23266 from edx/ahtisham/PROD-1262 
Updated requirements by make upgrade
 2020-03-04 13:07:55 +05:00
Ahtisham Shahid
fdc70935ac updated requirements by make upgrade 2020-03-04 12:23:19 +05:00
Jansen Kantor
dd5bc541ce add simple queryset (#23252) 2020-03-03 16:43:26 -05:00
Adam Butterworth
9094617d64 Prevent scrolling in chromeless view when iframed into learning mfe (#23291) 
TNL-7094
 2020-03-03 16:37:31 -05:00
Feanil Patel
440ef56f10 Feanil/delete flaky bokchoy tests (#23287) 
* Delete flaky test.

* Remove flaky instructor dashboard help test.

* Remove flaky problem type tests.

* Remove flaky studio container tests.

* Remove flaky studio container tests.

* Remove flaky studio problem editor tests.

* Remove flaky enrollment track mode tests.

* Delete flaky video transcript tests.

* Fix pep8 issue.
 2020-03-03 16:09:49 -05:00
atesker
bf14bc97d2 EDUCATOR-4920 Control permission to REST endpoint 
EDUCATOR-4920 Control permission to REST endpoint
CR1

EDUCATOR-4920 Control permission to REST endpoint
CR1
 2020-03-03 16:04:31 -05:00
edX cache uploader bot
1ccbd7d0c2 Updating Bokchoy testing database cache (#23290) 2020-03-03 15:30:31 -05:00