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

49937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edX requirements bot
2c5ac0407f Updating Python Requirements (#20772) 2019-06-07 10:19:38 -04:00
Feanil Patel
5694753ce6 Merge pull request #20765 from edx/renovate/npm-react-dom-vulnerability 
Update dependency react-dom to v16.1.2 [SECURITY]
 2019-06-07 10:09:19 -04:00
Thomas Tracy
f0ecc938ef Add IdentityServer3 Backend (#20275) 
* Add IdentityServer3 Backend

This adds a backend for users who want to use IdentityServer3 as their
SSO provider. It can be used with the OAuth2ProviderConfig in django
admin to point to an external provider.
 2019-06-07 09:38:46 -04:00
David Ormsbee
297dd174b5 Merge pull request #20229 from open-craft/josuebc/upstream/BB-1132 
BB-1132 Decrease NAME_MIN_LENGTH to 1.
 2019-06-06 17:23:04 -04:00
Josue Balandrano Coronel
df14f5cdf6 [BB-1132] Decrease NAME_MIN_LENGTH to 1 2019-06-06 22:52:00 +02:00
Feanil Patel
91f336c1ba Run npm install locally. 
Catch other changes to the lock file that should have been made.
 2019-06-06 16:31:43 -04:00
Feanil Patel
221153d864 Merge pull request #20770 from edx/feanil/update_renovate_config 
Allow for semver ranges.
 2019-06-06 16:22:47 -04:00
Feanil Patel
24d601827a Go back to what jasmin-jquery was pointing to before. 2019-06-06 15:57:51 -04:00
Feanil Patel
46926d0b7c Allow for semver ranges. 2019-06-06 15:40:37 -04:00
jansenk
e5c3084e8c return 422 on bad input 2019-06-06 15:39:46 -04:00
Thomas Tracy
221dc99d23 Merge pull request #20760 from edx/ttracy/ent-1994-dsc-flag-bug 
type uuid for proper encoding.
 2019-06-06 11:41:51 -04:00
Renovate Bot
5786a603ba Update dependency react-dom to v16.1.2 [SECURITY] 2019-06-06 15:27:35 +00:00
Brittney Exline
a47b6858c3 Merge pull request #20761 from edx/bexline/fix-edx-drf-extensions-again 
Pinning edx-enterprise, edx-drf-extensions, and edx-rbac to last stable versions
 2019-06-06 11:25:16 -04:00
Feanil Patel
dbb563fa49 Merge pull request #20754 from edx/renovate/configure 
Configure Renovate
 2019-06-06 11:23:49 -04:00
Brittney Exline
28d67bc22d Pinning edx-enterprise, edx-drf-extensions, and edx-rbac to last stable versions 2019-06-06 10:53:32 -04:00
Feanil Patel
905b6a4790 Merge pull request #20757 from edx/jenkins/upgrade-python-requirements-382f6dd 
Python Requirements Update
 2019-06-06 10:23:49 -04:00
Thomas Tracy
be0e6093cd type uuid for proper encoding. 2019-06-06 09:50:24 -04:00
edX requirements bot
e37de5f134 Updating Python Requirements 2019-06-06 06:53:04 -04:00
David Ormsbee
382f6ddc35 Merge pull request #20745 from open-craft/jill/models-gettext-lazy 
Campus.IL SE-1151 Strings used in models should always use gettext_lazy
 2019-06-05 19:53:10 -04:00
Brittney Exline
2b2e93bda7 Merge pull request #20756 from edx/bexline/fix-edx-drf-extensions 
Final upgrades to avoid errors from edx-drf-extensions
 2019-06-05 17:56:16 -04:00
Brittney Exline
819755b10b Final upgrades to avoid errors from edx-drf-extensions 2019-06-05 17:07:44 -04:00
Feanil Patel
9d3174331e Add custom config to renovate. 
* Slow it down so we don't get it all at once.
* Limit to only package.json for now.
 2019-06-05 16:26:16 -04:00
Christie Rice
c66ad09dbc REVMI-234 Remove flaky test (#20752) 2019-06-05 15:48:47 -04:00
Renovate Bot
737f007d0b Add renovate.json 2019-06-05 19:26:23 +00:00
Dave St.Germain
4b84d630de Merge pull request #20719 from edx/dcs/grade-support 
API support for bulk grade import/export
 2019-06-05 14:46:15 -04:00
Michael Youngstrom
c5f04c60b4 Update edx-lint to 1.3.0 (#20750) 2019-06-05 14:17:59 -04:00
edX cache uploader bot
a26ad5868a Updating Bokchoy testing database cache (#20749) 2019-06-05 13:58:24 -04:00
edX requirements bot
8022a7e3b2 Python Requirements Update (#20747) 
* Updating Python Requirements

* Don't rely on pip-compile cache

* Fix tornado dependency resolution
 2019-06-05 13:02:17 -04:00
jansenk
cf32f5bcf9 allow orgs w/o idp configured to enroll students in a program 2019-06-05 12:55:54 -04:00
Christie Rice
b5d07783b9 REVMI-234 Include user id in jwt sent to ecommerce (#20743) 
* REVMI-234 Include user id in jwt sent to ecommerce

* Reorder params
 2019-06-05 10:27:23 -04:00
David Ormsbee
74492907d8 Merge pull request #19582 from open-craft/josuebc/upstream/BB-732 
BB-732 Fix Django admin form for Course Enrollment
 2019-06-04 18:21:53 -04:00
edX cache uploader bot
1626270d1e Updating Bokchoy testing database cache (#20744) 2019-06-04 17:33:45 -04:00
Brian Mesick
86d9f52ff4 Merge pull request #20728 from edx/pwnage101/add-history-to-courseentitlement-courseoverview 
Add history to CourseEntitlement and Organization
 2019-06-04 16:24:42 -04:00
jansenk
095c420378 check curriculum rather than courses for program course membership 2019-06-04 14:06:00 -04:00
Troy Sankey
ec2b221b5e Bump edx-organizations and pin edx-opaque-keys 
Bumping edx-organizations will add history to the Organization model.

DE-1510
 2019-06-04 13:52:18 -04:00
Troy Sankey
df8f581d36 Add history to CourseEntitlement 
DE-1510
 2019-06-04 13:52:17 -04:00
edX cache uploader bot
f1f7e7e2ec Updating Bokchoy testing database cache (#20740) 2019-06-04 09:24:08 -04:00
Jillian Vogel
22ebf0e16f Strings used in models should always use gettext_lazy. 
Otherwise, they generate false migrations when languages other than
English are used as the default.
 2019-06-04 18:48:46 +09:30
Matthew Piatetsky
ba8d3a5990 Merge pull request #20671 from edx/REVEM-283 
[REVEM-283] add discount restriction stacked config models
 2019-06-03 15:06:58 -04:00
Ned Batchelder
05df361950 Merge pull request #20738 from edx/nedbat/django-1-11-21 
Django 1.11.21
 2019-06-03 14:07:18 -04:00
Matthew Piatetsky
8f2d7cfc8a switch enabled to disabled 2019-06-03 14:02:04 -04:00
Dave St.Germain
cb5ec5a65d Grade api support for bulk grading 2019-06-03 13:53:30 -04:00
Alex Dusenbery
e5fd43264d EDUCATOR-4307 | Don't bother with celery to run expire waiting enrollments command. 2019-06-03 13:08:59 -04:00
Ned Batchelder
70cd9f35c5 Django 1.11.21 2019-06-03 10:42:35 -04:00
David Ormsbee
12d893862c Merge pull request #20632 from tanyaxp/progress-certificates-title 
Remove the word "Student" from the progress title.
 2019-06-03 10:33:48 -04:00
Kyle McCormick
c487b9a384 Change 'withdrawn' status to 'canceled' in program_enrollments 
This makes the LMS program_enrollments API compatible with the
Registrar programs API, as specified in the Master's partner
integration guide.

EDUCATOR-4389
 2019-06-03 10:16:19 -04:00
Matthew Piatetsky
b32ed9ff2b add discount restriction stacked config models 2019-06-02 18:21:31 -04:00
alangsto
4a1346b068 INCR-265 Run python-modernize on lms/djangoapps/courseware/management and lms/djangoapps/courseware/tests (#20716) 
* updated files according to INCR-265

* fixed docstring and line-length problems from quality test

* Revert "fixed docstring and line-length problems from quality test"

This reverts commit d050f55a4ecfaa38f46b80ec4bb85ff399a79a8c.

* fixed errors reported in quality report

* had error, fixed it

* reversed change

* fixed over/under indentation, and added line to import.py that Ned had suggested

* tried disabling pylint for this line

* testing new email

* testing email in different window

* re-added symlink and docstring
 2019-05-31 14:07:18 -04:00
Andytr1
9e01a9e2aa Merge pull request #20727 from edx/Andytr1-patch-1 
Update testing.rst
 2019-05-31 13:16:35 -04:00
Ned Batchelder
f72b1d56de Merge pull request #20639 from edx/nedbat/welcome-message 
Some trademark improvements to the default home page
 2019-05-31 12:39:41 -04:00