Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,513 Commits 1 Branch 0 Tags
919dc5760ac85c997e08071127dc54bed5ac79ae
Commit Graph

53513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Terry
b96efcf71b Merge pull request #23258 from edx/mikix/experiment-flag 
Add ExperimentWaffleFlag
 2020-03-03 15:01:16 -05:00
Simon Chen
eb3e36b822 MST-121 We should allow the business case where a learner can be enrolled into a program, then unenrolled, then enroll into another program with the same course 2020-03-03 14:39:57 -05:00
Michael Terry
e724a4bcb7 Add ExperimentWaffleFlag 
This is a helpful class when running an experiment, to help
bucket users and keep track of which enrollments to consider
as part of the experiment.

AA-53
 2020-03-03 14:39:02 -05:00
Diana Huang
6feee4540c Merge pull request #23280 from edx/diana/remove-dupe-countries 
Make upgrade to remove duplicate django-countries.
 2020-03-03 13:52:57 -05:00
Alex Dusenbery
d920597c63 Update ORA to 2.6.16 | Fixes the text_response property to be more backwards-compatible with _old_ ORA blocks. 2020-03-03 12:59:33 -05:00
Diana Huang
c111348076 Make upgrade to remove duplicate django-countries. 2020-03-03 12:54:20 -05:00
David Ormsbee
6c7a3ca090 Merge pull request #23263 from edx/ormsbee/fix_blockstructures_collect_devstack 
Allow Block Structures Collect to work in Studio
 2020-03-03 12:13:32 -05:00
Calen Pennington
70800ae92b Merge pull request #23244 from edx/aj/update-edx-when 
Upgrade edx-when
 2020-03-03 12:03:14 -05:00
Diana Huang
8e6647234f Update migration to not modify providerapipermissions. (#23271) 2020-03-03 11:31:56 -05:00
edX cache uploader bot
62e1b84460 Updating Bokchoy testing database cache (#23272) 2020-03-03 11:05:44 -05:00
Troy Sankey
bfd45980c7 Merge pull request #23236 from edx/pwnage101/deng-18-rename_site_configuration_siteconfiguration_values_2.2 
Add migration to populate site_values in SiteConfigurationHistory
 2020-03-03 11:05:27 -05:00
David Ormsbee
9d3f4985ed Allow Block Structures Collect to work in Studio 
Block Structures were meant to be gathered using the LMS process,
as it's meant to be an optimized store for the LMS to use. But
there's an argument to be made for at least the Collect side of
the Collect + Transform could be a Studio concern, because it
explicitly needs to avoid user-awareness.

In either event, collect() was broken on devstack before this
commit because Studio's runtime does not permit handler_url
invocation on "thirdparty" XBlocks. Since VideoBlock is not
really third-party (and it's questionable whether there's any
benefit to making the distinction these days), I'm just making
this change to allow Studio to run collect() without error in
the Studio process. This will fix devstack, which does not
properly route these collect() calls to the LMS process (because
celery runs in-proc by default).
 2020-03-03 10:52:46 -05:00
Manjinder Singh
4399d13955 removing all of provider (#23269) 
* Revert "Ran make migration on third_party_auth (#23253)"

This reverts commit 49be65cc58.

* Removing provider.util import

* Removing further provider things

* Adding hash tests
 2020-03-03 10:42:18 -05:00
Awais Jibran
ca48c42214 Merge pull request #23245 from edx/aj/handle-not-enrolled-case-extentions 
Fix due date extension view.
 2020-03-03 20:36:19 +05:00
Awais Jibran
c6e0985812 Upgrade edx-when in edx-platform 
Run `make upgrade` on edx-platform to update python packages.
PROD-1333
 2020-03-03 20:01:09 +05:00
Feanil Patel
dea918b8b8 Merge pull request #23270 from edx/revert-23253-msingh/run_migration 
Revert "Ran make migration on third_party_auth"
 2020-03-03 09:57:48 -05:00
Manjinder Singh
fa2140cd16 Revert "Ran make migration on third_party_auth (#23253)" 
This reverts commit 49be65cc58.
 2020-03-03 09:17:26 -05:00