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

4394 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Michael Terry
b96efcf71b Merge pull request #23258 from edx/mikix/experiment-flag 
Add ExperimentWaffleFlag
 2020-03-03 15:01:16 -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
Calen Pennington
70800ae92b Merge pull request #23244 from edx/aj/update-edx-when 
Upgrade edx-when
 2020-03-03 12:03:14 -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
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
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
Braden MacDonald
af6cab86c3 Enforce permissions for content libraries, add REST API to edit perms 2020-03-02 18:17:46 -08:00
Dave St.Germain
c1a09ffcbb Merge pull request #23238 from edx/dcs/mode-info 
Add verified mode to the courseware API
 2020-03-02 18:16:12 -05:00
Cory Lee
4be35d9eca DENG-17 Dropping FK on schedules to enrollments to perform ghost migration (#23260) 2020-03-02 16:32:04 -05:00
Albert (AJ) St. Aubin
0721357e46 Create MB External ID on creation of a CourseEntitlement in MB Program 2020-03-02 13:44:20 -05:00
Troy Sankey
06b547057e Add migration to populate site_values in SiteConfigurationHistory 
Right now the ORM is very unhappy about the JSONField `site_values`
in SiteConfigurationHistory containing non-JSON (empty strings).  We
cannot even write a data migration using the ORM to populate the field
because that causes a JSONDeserializationError.  Therefore, we must
bypass the ORM and populate the values with raw SQL.

DENG-18
 2020-03-02 11:44:28 -05:00
Cory Lee
2c87aeddc3 DENG-17 Dropping the FK on schedulesexperience->schedule to apply change to schedule as a gh-ost migration (#23242) 2020-03-02 10:10:52 -05:00
Feanil Patel
5ec487452d Merge pull request #23188 from edx/robrap/BOM-1324-add-constraint 
BOM-1324: remove oauth2.enforce_jwt_scopes toggle
 2020-03-02 09:55:35 -05:00
Manjinder Singh
d08cd9ce04 Removing provider imports from edx-platform (#23229) 
* Removing from provider imports from openedx

 * removed all uses of retire_dop_oauth2_models

* Removing provider library from lms, common, and cms

Created/copied function short_token(from django-oauth-provider) and create_hash256 to help with conversion
 2020-03-02 08:56:54 -05:00
Bill DeRusha
c1ebdaf0c3 Fix Deprecation: log.warn -> log.warning 2020-02-28 15:04:07 -05:00
Dave St.Germain
84e854d22c Merge pull request #23205 from edx/dcs/fix-tabs 
Add url_slug to the CourseOverviewTab, to support serializing StaticTabs
 2020-02-28 12:43:36 -05:00
Dave St.Germain
7d94408132 Add verified mode to the courseware API 2020-02-28 12:42:26 -05:00
Frank Bijlsma
a195b5699c expand subsections when the url anchor points to them. 2020-02-28 11:32:13 -03:00
Feanil Patel
54d7743817 Don't iterate over an empty filters list. 2020-02-27 16:32:43 -05:00
Feanil Patel
781629d489 Correct docs and test of restricted JWTs. 
The comment is misleading beacuse now that restricted JWTs are enforced
everywhere, we don't need to set the expiry to be in the past for JWT
tokens.
 2020-02-27 15:53:48 -05:00
Calen Pennington
5cce110a91 Merge pull request #23217 from cpennington/edx-when-published-only 
Only extract published dates into edx-when
 2020-02-27 15:12:51 -05:00
Calen Pennington
5ea77433d3 Only extract published dates into edx-when 2020-02-27 14:10:12 -05:00
Troy Sankey
ac4fd6f91a Merge pull request #23224 from edx/revert-23214-pwnage101/rename_site_configuration_siteconfiguration_values_2.1 
Revert "Rename values in SiteConfiguration (2/3) attempt #2"
 2020-02-27 13:58:53 -05:00
Calen Pennington
6d2ad6aa2f Merge pull request #23219 from cpennington/fix-emails-no-weeks 
Don't try and multiply None with a number when computing number of we…
 2020-02-27 13:31:36 -05:00
Troy Sankey
e6f58b6d4c Revert "Rename values in SiteConfiguration (2/3) attempt #2" 2020-02-27 13:24:55 -05:00
Calen Pennington
70314cfa7b Don't try and multiply None with a number when computing number of weekly emails to send 2020-02-27 11:47:28 -05:00
jinder1s
295da79fe5 Remove DOP dispatching from oauth_dispatch. 
https://openedx.atlassian.net/browse/BOM-1330
 2020-02-27 10:47:06 -05:00
Feanil Patel
fe22e77072 Merge pull request #23199 from edx/robrap/BOM-1292-remove-application-organization 
BOM-1292: remove uses of ApplicationOrganization
 2020-02-27 10:36:46 -05:00
Troy Sankey
3fdd08b683 Merge pull request #23214 from edx/pwnage101/rename_site_configuration_siteconfiguration_values_2.1 
Rename values in SiteConfiguration (2/3) attempt #2
 2020-02-27 10:34:37 -05:00
Robert Raposa
e2cc7fa348 fix failing tests 2020-02-27 09:00:01 -05:00
Robert Raposa
a4716c75cb fix tests 2020-02-27 08:58:45 -05:00
Robert Raposa
84686e81c3 BOM-1324: remove oauth2.enforce_jwt_scopes toggle 
The oauth2.enforce_jwt_scopes waffle switch was added temporarily for
the rollout of jwt scopes. This removes the toggle and replacing code
with the equivalent of `oauth2.enforce_jwt_scopes` as True.
 2020-02-27 08:58:45 -05:00
Feanil Patel
4a54967cc5 Replace the ApplicationOrganization in EdxOAuth2AuthorizationView 
Move to using the filters list provided in the ApplicationAccess model
to genarically store scopes instead of the org specific ApplicationOrg
model mapping.
 2020-02-26 16:02:39 -05:00
Matt Tuchfarber
7cd9cb4381 Merge pull request #23212 from edx/tuchfarber/MICROBA-195 
Add phone number to account API
 2020-02-26 15:31:39 -05:00
Matt Tuchfarber
82024fbf77 Add phone number to account API 
This is so it's user editable in the Account MFE.
 2020-02-26 15:06:38 -05:00
Troy Sankey
3400326e50 Fix migration issue with the missing method. 
This commit fixes an issue originally in 3541643d where an instance
method on a model was missing in a migration.  The problem was that
Django is smarter than we thought, and is somehow able to construct an
older version of the model before the commit, where there was no such
method.  The solution is just to pull the method out of the model.

DENG-18
 2020-02-26 14:44:14 -05:00
Albert (AJ) St. Aubin
fce217b0dc Merge pull request #23148 from edx/aj/MICROBA-150 
MICROBA-150 Creating EnternalIds for users enrolling in MB Programs
 2020-02-26 14:07:19 -05:00
Albert (AJ) St. Aubin
b1bbfc7065 Creating EnternalIds for users enrolling in MB Programs 2020-02-26 13:35:31 -05:00