Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
49,145 Commits 1 Branch 0 Tags
68ab69a46b89176e986df00a98b7324f87f3b33d
Commit Graph

3387 Commits

Author SHA1 Message Date
Matthew Piatetsky
f69811ee91 add course blocks api check to _assert_block_is_gated function 2019-04-03 14:13:59 -04:00
Matthew Piatetsky
e14c5d69ec Merge pull request #20091 from edx/check_for_denial_reason 
handle missing fields on access denied blocks
 2019-04-03 14:13:03 -04:00
Matthew Piatetsky
418540b713 handle missing fields on access denied blocks 2019-04-03 12:32:35 -04:00
Michael Youngstrom
d859d2300c INCR-190 2019-04-02 15:25:52 -04:00
Diana Huang
238a91c0e6 Merge pull request #20115 from edx/diana/removing-microsites 
Remove dependence on microsite factory.
 2019-04-02 13:57:35 -04:00
Michael Youngstrom
fd4bb5191a Merge pull request #20113 from edx/INCR-187 
INCR-187
 2019-04-02 10:46:09 -04:00
Michael Youngstrom
e624b4f11e Merge pull request #20114 from edx/INCR-186 
INCR-186
 2019-04-02 10:45:53 -04:00
Andrés González
26b3a40133 INCR-108 (#20058) 
* INCR-108: Run python-modernize on openedx/core/lib

* Fixed urlencode import

* Fixed diff quality warnings and six.string_types error

* Fixed pickle import

* Fixed iteritems import

* Fixed ungrouped imports

* Fixed six.moves import issues
 2019-04-02 10:26:00 -04:00
Michael Youngstrom
de52c6d310 INCR-186 2019-04-01 16:08:31 -04:00
Michael Youngstrom
01fa25a595 INCR-187 2019-04-01 15:47:32 -04:00
Diana Huang
bc37cf1247 Remove dependence on microsite factory. 2019-04-01 15:41:28 -04:00
Jeremy Bowman
c75da56a85 Merge pull request #20105 from open-craft/giovanni/incr-118 
INCR-118: Run python-modernize on openedx/core/djangoapps/content/cou…
 2019-03-29 18:37:46 -07:00
Jeremy Bowman
c859b168f9 Merge pull request #20104 from jolyonb/incr-179 
INCR-179 Migrating openedx/features/journals
 2019-03-29 18:15:56 -07:00
Jolyon Bloomfield
202edb872b INCR-179 Migrating openedx/features/journals 2019-03-29 15:25:54 -07:00
Alex Dusenbery
3848e86ce9 EDUCATOR-4222 | Let the gating API read persistent grade information. 2019-03-29 16:13:56 -04:00
Michael Youngstrom
9ce60190d4 Merge pull request #20090 from edx/youngstrom/INCR-113 
INCR-113
 2019-03-29 14:53:38 -04:00
Michael Youngstrom
98cd8881b6 Merge pull request #20088 from edx/youngstrom/INCR-138 
INCR-138
 2019-03-29 14:14:04 -04:00
Michael Youngstrom
54a8b4baf9 Merge pull request #20087 from edx/youngstrom/INCR-182 
INCR-182
 2019-03-29 14:13:47 -04:00
Calen Pennington
333f74d37e Remove the rest of binning code from Access Expiry emails 2019-03-29 11:44:39 -04:00
Matthew Piatetsky
4966b30bb5 Merge pull request #20071 from edx/revert-20064-revert-20003-mobile-access-denied 
continue removing blocks from course outline
 2019-03-29 11:20:59 -04:00
Michael Youngstrom
69f1c6efdc INCR-113 2019-03-29 11:14:31 -04:00
Robert Raposa
1875f006c6 Merge pull request #20076 from edx/robrap/ARCH-603-oauth-application-access-command 
ARCH-603: add optional scopes to create application access
 2019-03-29 10:01:54 -04:00
Michael Youngstrom
cc13efdc2c INCR-138 2019-03-29 09:52:59 -04:00
Michael Youngstrom
ef6e03f32b INCR-182 2019-03-29 09:47:35 -04:00
Michael Youngstrom
8ad58c35d3 Merge pull request #20075 from edx/youngstrom/INCR-169 
INCR-169
 2019-03-29 09:29:56 -04:00
Michael Youngstrom
a1a6131979 Merge pull request #20074 from edx/youngstrom/finish-catalog 
INCR-181
 2019-03-29 09:29:34 -04:00
Giovanni Cimolin da Silva
13e8322b00 INCR-118: Run python-modernize on openedx/core/djangoapps/content/course_overviews/migrations 2019-03-28 15:46:29 -07:00
Guruprasad Lakshmi Narayanan
2e305964f5 [INCR-180] Compatibility changes - openedx/core/djangoapps/theming/tests 2019-03-28 15:26:31 -07:00
Michael Youngstrom
b238752d94 INCR-169 2019-03-28 17:15:45 -04:00
Robert Raposa
c12048ed1f add optional scopes to create application access 
Supply create_dot_application with optional scopes argument to create
an oauth_dispatch ApplicationAccess with the provided scopes.

ARCH-603
 2019-03-28 17:04:30 -04:00
Michael Youngstrom
a5e8c167eb Run python-modernize on openedx/core/djangoapps/catalog 2019-03-28 16:52:29 -04:00
Michael Youngstrom
63f799ff8f Merge pull request #20066 from edx/youngstrom/INCR-117 
INCR-117: Run python-modernize on catalog/management, catalog/migrations, catalog/tests
 2019-03-28 15:56:05 -04:00
Michael Youngstrom
c8f5d55a17 Merge pull request #20063 from edx/youngstrom/INCR-153 
INCR-153: Run python-modernize on openedx/core/djangoapps/credit/tests
 2019-03-28 15:55:53 -04:00
Cory Lee
f6bf01661a Merge pull request #19959 from edx/coryleeio/remove_aws_py 
Remove aws.py
 2019-03-28 15:25:35 -04:00
Matthew Piatetsky
1f6cd7aa5a Revert "Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason"" 2019-03-28 14:44:05 -04:00
Christopher Pappas
3fcf99f65b ENT-1556 - Adding in roles claim to jwt for use with edx rbac 
Adding logic that adds roles to jwt

Quality fixes
 2019-03-28 14:17:07 -04:00
Cory Lee
fc402473c0 Merge branch 'master' into coryleeio/remove_aws_py 2019-03-28 14:08:02 -04:00
Michael Youngstrom
c5b99ec035 python-modernize and isort 2019-03-28 12:49:29 -04:00
Michael Youngstrom
6d3e7237da Merge pull request #20062 from edx/youngstrom/INCR-171 
INCR-171: Run python-modernize on openedx/core/djangoapps/profile_images
 2019-03-28 12:05:29 -04:00
Michael Youngstrom
488e54247d group 2019-03-28 11:14:51 -04:00
Cory Lee
ac4845d052 DEPR-14 Remove AWS.py 2019-03-28 10:48:34 -04:00
Michael Youngstrom
1139eb6bfb Run python-modernize on openedx/core/djangoapps/credit/tests 2019-03-28 09:57:20 -04:00
Michael Youngstrom
0ab0f6bda8 run python-modernize openedx/core/djangoapps/profile_images 2019-03-28 09:51:19 -04:00
Robert Raposa
fe69add748 Merge pull request #20057 from edx/robrap/ARCH-603-fix-user-id-scope 
ARCH-603: Add user_id scope to various defaults.
 2019-03-27 20:09:13 -04:00
Robert Raposa
e52db402b8 add user_id scope to the list of available scopes 
This should have been done when the scope was first added as part
of (#19765).

ARCH-603
 2019-03-27 19:00:04 -04:00
Matthew Piatetsky
8eae694566 Revert "REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason" 2019-03-27 16:30:37 -04:00
Calen Pennington
6a15e57092 Merge pull request #20056 from cpennington/fbe/access-expiry-no-binning 
Don't use multiple bins per course when sending Access Expiry Emails
 2019-03-27 12:49:28 -04:00
Douglas Hall
555bba1d3c Merge pull request #20060 from edx/douglashall/ARCH-586 
ARCH-586 Always send 404 response on requests for non-existent user accounts.
 2019-03-27 12:42:24 -04:00
Douglas Hall
7fdc4a9f73 Always send 404 response on requests for non-existent user accounts. 2019-03-27 11:19:23 -04:00
Matthew Piatetsky
e6b55ede3d Merge pull request #20003 from edx/mobile-access-denied 
REVMI-62 Return gated blocks in the course blocks API response with an authorization denial reason
 2019-03-26 17:33:57 -04:00