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

49965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andytr1
765559c708 Merge pull request #20758 from edx/andytr1/grades_simple_history 
Adding simple history to track grade changes. Educator-4347
 2019-06-10 12:39:54 -04:00
Andytr1
83d1ad92d0 Merge pull request #20787 from edx/andytr1/fix_proctoring_options 
Potential fix for review rules - EDUCATOR-4262
 2019-06-10 12:39:40 -04:00
Brittney Exline
5b14158470 Merge pull request #20779 from edx/bexline/unpin-edx-enterprise 
Unpin edx-enterprise and edx-drf-extensions
 2019-06-10 12:12:45 -04:00
atesker
817de2b215 Potential fix for review rules - EDUCATOR-4262 2019-06-10 10:56:13 -04:00
Dave St.Germain
23ab20a6fd Prevent import failure on CMS 2019-06-10 10:49:06 -04:00
Feanil Patel
266bfb5419 Merge pull request #20781 from edx/feanil/automate_script_makefile 
Add a script requirements file to upgrade automation.
 2019-06-10 10:20:49 -04:00
atesker
6ed1bb72cc Potential fix for review rules - EDUCATOR-4262 2019-06-10 09:54:11 -04:00
atesker
b5acb55dcc Potential fix for review rules - EDUCATOR-4262 2019-06-10 09:32:22 -04:00
David Ormsbee
c80d8811c7 Merge pull request #20784 from edx/jenkins/upgrade-python-requirements-01e1f23 
Python Requirements Update
 2019-06-08 10:41:46 -04:00
edX requirements bot
84ef1f277c Updating Python Requirements 2019-06-08 06:50:00 -04:00
David Ormsbee
01e1f23f51 Merge pull request #20158 from cthai18/fix/create-account-text 
Change button text for creating account
 2019-06-07 17:36:32 -04:00
atesker
a914faf11c Adding simple history to track grade changes. Educator-4347 
added migration

Adding simple history to track grade changes. Educator-4347
Adding migration file

Adding simple history to track grade changes. Educator-4347
Adding migration file

Adding simple history to track grade changes. Educator-4347
Adding migration file

Re-adding lms.djangoapps reference to see if it will fix the build issues

Re-adding lms.djangoapps reference to see if it will fix the build issues
 2019-06-07 16:32:56 -04:00
Farhanah Sheets
2186b1a40b Merge pull request #20777 from edx/fsheets/about-page-message 
Add in messaging for 403 errors on about pages & update error color for a11y
 2019-06-07 15:18:06 -04:00
Feanil Patel
14c642dab6 Add a script requirements file to upgrade automation. 
The xblock counting script had a requirements file that was not
previously being tracked and had an out of date version of requests.
Add it to the `upgrade` make target so that it stays up to date.
 2019-06-07 15:10:40 -04:00
Feanil Patel
77eb3d2a82 Merge pull request #20778 from edx/renovate/edx-edx-bootstrap-1.x 
Update dependency @edx/edx-bootstrap to v1.0.4
 2019-06-07 14:54:26 -04:00
Brittney Exline
96cc889171 Unpin edx-enterprise and edx-drf-extensions 2019-06-07 14:35:38 -04:00
Feanil Patel
d75f98a0a1 Run npm install in devstack. 
The output that renovate generates is different from what the version of
npm we're using generates.
 2019-06-07 13:42:19 -04:00
Renovate Bot
051a000bac Update dependency @edx/edx-bootstrap to v1.0.4 2019-06-07 16:02:27 +00:00
Feanil Patel
093b51f743 Merge pull request #20775 from edx/feanil/correctly_pin_jasmin_jquery 
Version 2.1.1 on NPM is not exactly the thing we use.
 2019-06-07 12:00:54 -04:00
Matthew Piatetsky
aba836b517 Merge pull request #20674 from edx/REVEM-354 
add discount banner to track selection and discount price to upgrade button
 2019-06-07 11:35:34 -04:00
Feanil Patel
77a2317170 Merge pull request #20764 from edx/renovate/npm-moment-vulnerability 
Update dependency moment to v2.19.3 [SECURITY]
 2019-06-07 11:28:28 -04:00
Farhanah Sheets
6bd3f2ff51 Add in messaging for 403 error cases on about pages and update error color for a11y 2019-06-07 11:22:52 -04:00
Feanil Patel
5a4a99d806 Version 2.1.1 on NPM is not exactly the thing we use. 
It looks like the package maintainers had a v2.1.1 that was on github
but then released a different 2.1.1 to NPM.  When renovate(upgrade
automation) tries to make any changes, it updates the lockfile to point
to the NPM one which currently breaks tests.

Pinning to the correct version in the package.json so that we can get
other things upgraded.
 2019-06-07 11:08:55 -04:00
Feanil Patel
2e6675938c Fix tests while still upgrading moment. 
- Moved jasmin-jquery back to pointing at git.  The version on NPM is
not the same because they made more changes to 2.1.1 before releasing it
to NPM.

- Run `npm install` locally because it produces slightly different
output than renovate which causes the quality tests to fail.
 2019-06-07 10:52:07 -04:00
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
Renovate Bot
d68c350b9e Update dependency moment to v2.19.3 [SECURITY] 2019-06-06 15:26:56 +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
Chester Thai
134c8be2d0 Change button text for creating account 
Changed button text from "Register through edX" to "Create an Account" on Register with Institution/Campus Credentials page, so we don't have the hardcoded name edX for different organizations.
 2019-06-05 15:18:45 -07: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
Matthew Piatetsky
ce5b976f5e update local currency code 2019-06-05 15:46:16 -04:00