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

49129 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Dusenbery
eff3a07005 Add a course_modes REST API. 2019-04-03 14:44:00 -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
edx-pipeline-bot
d770189ba0 Merge pull request #20143 from edx/release-mergeback-to-master 
Merge release back to master
 2019-04-03 23:07:28 +05:00
Matthew Piatetsky
418540b713 handle missing fields on access denied blocks 2019-04-03 12:32:35 -04:00
Zia Fazal
3307e70423 Merge pull request #20139 from edx/ziafazal/WL-1908 
WL-1908: Version bump to get edx-enterprise 1.3.10
 2019-04-03 19:46:46 +05:00
Matthew Piatetsky
7dacd54d86 Merge pull request #20132 from edx/REVMI-92 
Clarify partially enabled state in the FBE support tool
 2019-04-03 09:50:33 -04:00
Michael Youngstrom
dc156e4f8c Merge pull request #20127 from edx/youngstrom/INCR-190 
INCR-190
 2019-04-03 09:31:31 -04:00
Zia Fazal
963e0fe22d Version bump to get edx-enterprise 1.3.10 
revert pillow version
 2019-04-03 13:23:17 +05:00
Jolyon Bloomfield
27e1d28ed2 INCR-185 Modernize common/lib/xmodule/xmodule/assetstore and contentstore (#20124) 
* INCR-185 Modernize common/lib/xmodule/xmodule/assetstore and contentstore

* Adding check for python version when making integer contracts
 2019-04-02 19:56:28 -04:00
Bessie Steinberg
fc696ef529 Merge pull request #20128 from edx/bessiesteinberg/ent-1334 
ENT-1334: Fix: SSO users last_login set to NULL
 2019-04-02 16:08:47 -04:00
Feanil Patel
442a9132d8 Merge pull request #20131 from edx/fix-nr-memory-leak 
Upgrade newrelic agent to fix a memory leak in Python 2
 2019-04-02 12:46:33 -07:00
Matthew Piatetsky
d9096e432e Clarify partially enabled state in the FBE support tool 2019-04-02 15:39:24 -04:00
Calen Pennington
e718933299 Upgrade newrelic agent to fix a memory leak in Python 2 2019-04-02 15:36:48 -04:00
Michael Youngstrom
d859d2300c INCR-190 2019-04-02 15:25:52 -04:00
Bessie Steinberg
243738f828 ENT-1334: Fix: SSO users last_login set to NULL 
- The very first time a user signed in through SSO their ```last_login```
  field on the ```auth_user``` table was set to NULL instead of the
  appropriate time stamp.  This fixes that issue.
 2019-04-02 14:40:55 -04:00
Michael Youngstrom
d62b393c58 Merge pull request #20125 from edx/youngstrom/INCR-128 
INCR-128
 2019-04-02 14:18:24 -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
Douglas Hall
c8c365041b Merge pull request #20111 from edx/douglashall/ARCH-607 
ARCH-607 Add API view for retrieving third party auth user status.
 2019-04-02 13:40:13 -04:00
Douglas Hall
7128059921 Add API view for retrieving third party auth user status. 2019-04-02 12:58:13 -04:00
Michael Youngstrom
9d589f997d INCR-128 2019-04-02 12:40:26 -04:00
Michael Youngstrom
746b5a7e8d Merge pull request #20119 from edx/testeng/bokchoy_auto_cache_update_f2440cac82cfce5547d42c8bf9504468bee4a743 
Bokchoy db cache update
 2019-04-02 12:21:02 -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
edx-cache-uploader-bot
db6de5990d Updating migrations 2019-04-02 10:32:26 -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
Christie Rice
bfce40663e Merge pull request #20110 from edx/crice/flakyTest 
Remove flaky test test_birth_year_not_set
 2019-04-02 09:27:29 -04:00
Jeremy Bowman
95986c4f9a Merge pull request #20116 from jolyonb/incr-162 
INCR-156 Migrated and cleaned up imports on /common/lib/capa/capa/tests/
 2019-04-01 20:25:05 -04:00
David Ormsbee
e712be7892 Merge pull request #20094 from stvstnfrd/sysadmin/user-courses 
Remove course listing from user tab of sysadmin
 2019-04-01 17:45:26 -04:00
David Ormsbee
810b8b60f8 Merge pull request #19618 from open-craft/josuebc/upstream/BB-755 
BB-755 Add feature to manually unlock a student account after too many login attempts.
 2019-04-01 17:42:19 -04:00
David Ormsbee
cee5d47338 Merge pull request #20093 from stvstnfrd/sysadmin/plots 
Remove unused 'plot' references in sysadmin
 2019-04-01 17:28:47 -04:00
Michael Youngstrom
de52c6d310 INCR-186 2019-04-01 16:08:31 -04:00
Jolyon Bloomfield
932a76c958 INCR-162 Migrated and cleaned up imports on /common/lib/capa/capa/tests/ 2019-04-01 15:53:08 -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
Matt Tuchfarber
f2119ff837 Merge pull request #20112 from edx/tuchfarber/add_username_to_production_settings 
Add username replacement worker to production settings
 2019-04-01 11:55:06 -07:00
Matt Tuchfarber
a87aea8eff Add username replacement worker to production settings 2019-04-01 14:02:49 -04:00
Christie Rice
e0766a3a85 Merge pull request #20103 from edx/crice/REVEM-262_logging 
REVEM-262 Add more logging of ids
 2019-04-01 13:11:48 -04:00
Michael Youngstrom
59967d3ee6 Merge pull request #20083 from edx/testeng/bokchoy_auto_cache_update_a2cbb5d4d1ee2ee817aa59048db11123951b4805 
Bokchoy db cache update
 2019-04-01 12:31:39 -04:00
Christie Rice
22fcc12d24 REVEM-262 Add more logging of ids 2019-04-01 10:18:31 -04:00
Christie Rice
349bc33ac0 Remove flaky test test_birth_year_not_set 2019-04-01 09:32:37 -04:00
Christie Rice
5462474aa6 Merge pull request #20072 from edx/crice/REVEM-203_dashboard 
REVEM-203 Add course and program info to dashboard metadata
 2019-04-01 09:16:53 -04:00
edX Transifex Bot
9449c83218 fix(i18n): update translations 2019-03-31 17:23:58 -04:00
David Ormsbee
f2f010ac0a Merge pull request #20098 from stvstnfrd/sysadmin/cache-courses 
Cache courses list on sysadmin courses page
 2019-03-31 10:19:33 -04:00
Christie Rice
052683f926 REVEM-203 Add course and program info to dashboard metadata 2019-03-30 08:30:07 -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
stv
21f79de92f Cache courses list on sysadmin courses page 
We were performing this lookup multiple times in the POST handler;
this should increase speed and memory use, which has been problematic
with this feature.
 2019-03-29 14:57:04 -07:00
Stu Young
ad0e0da2db Merge pull request #20102 from jolyonb/incr-127 
INCR-127: Migrating common/djangoapps/course_action_state
 2019-03-29 17:04:38 -04:00
Alex Dusenbery
3848e86ce9 EDUCATOR-4222 | Let the gating API read persistent grade information. 2019-03-29 16:13:56 -04:00