Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Set NPM dependencies more stably

Browse Source 
also manually increment edx-proctoring version, since that's all we
wanted to achieve with this
This commit is contained in:
Matt Hughes
2018-12-06 16:57:27 -05:00
committed by Dave St.Germain
parent 6264d75f49
commit 91b9478755
5 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@@ -86,17 +86,16 @@
}
},
"@edx/edx-proctoring": {
"version": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3"
"version": "1.5.0-rc.1",
"resolved": "https://registry.npmjs.org/@edx/edx-proctoring/-/edx-proctoring-1.5.0-rc.1.tgz",
"integrity": "sha512-ONkLR0jW1REC+Z40FPLP0lhT/TEF1UR2sElrpfmO2gTxYbk/Dw5ah9eYPOhBuQNp4giYDzZeCNfz5pgILDeo9w=="
},
"@edx/mockprock": {
"version": "git+https://git@github.com/edx/mockprock.git#181d2c962006ffcecfda009ee9b6f417982c48c6",
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/@edx/mockprock/-/mockprock-1.0.1.tgz",
"integrity": "sha512-XUVRpmeBUvNKaKG3lZz9D8HY4Mykw5duW6qAmSQUOWFy2ILaMFjcT5hMApog/xC9rIp2P2EEzha0tOwuiP7P2g==",
"requires": {
"@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3"
},
"dependencies": {
"@edx/edx-proctoring": {
"version": "git+https://git@github.com/edx/edx-proctoring.git#0cb6a1603fd39a4955b125f674480ac4ccf13ce3"
}
"@edx/edx-proctoring": "1.5.0-rc.1"
}
},
"@edx/paragon": {

4
package.json
View File

@@ -4,8 +4,8 @@
"dependencies": {
"@edx/cookie-policy-banner": "1.1.10",
"@edx/edx-bootstrap": "1.0.3",
"@edx/edx-proctoring": "git+https://git@github.com/edx/edx-proctoring.git",
"@edx/mockprock": "git+https://git@github.com/edx/mockprock.git",
"@edx/edx-proctoring": "^1.5.0-rc.1",
"@edx/mockprock": "^1.0.1",
"@edx/paragon": "2.6.4",
"@edx/studio-frontend": "1.16.12",
"babel-core": "6.26.0",

4
requirements/edx/base.txt
View File

@@ -126,6 +126,7 @@ edx-opaque-keys[django]==0.4.4
edx-organizations==1.0.0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
edx-proctoring==1.4.0
=======
edx-proctoring==1.5.0b1
@@ -133,6 +134,9 @@ edx-proctoring==1.5.0b1
=======
edx-proctoring==1.5.0b3
>>>>>>> Updated edx-proctoring pre-release
=======
edx-proctoring==1.5.0rc1
>>>>>>> Set NPM dependencies more stably
edx-rest-api-client==1.9.2
edx-search==1.2.1
edx-submissions==2.0.12

4
requirements/edx/development.txt
View File

@@ -146,6 +146,7 @@ edx-opaque-keys[django]==0.4.4
edx-organizations==1.0.0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
edx-proctoring==1.4.0
=======
edx-proctoring==1.5.0b1
@@ -153,6 +154,9 @@ edx-proctoring==1.5.0b1
=======
edx-proctoring==1.5.0b3
>>>>>>> Updated edx-proctoring pre-release
=======
edx-proctoring==1.5.0rc1
>>>>>>> Set NPM dependencies more stably
edx-rest-api-client==1.9.2
edx-search==1.2.1
edx-sphinx-theme==1.4.0

4
requirements/edx/testing.txt
View File

@@ -141,6 +141,7 @@ edx-opaque-keys[django]==0.4.4
edx-organizations==1.0.0
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
edx-proctoring==1.4.0
=======
edx-proctoring==1.5.0b1
@@ -148,6 +149,9 @@ edx-proctoring==1.5.0b1
=======
edx-proctoring==1.5.0b3
>>>>>>> Updated edx-proctoring pre-release
=======
edx-proctoring==1.5.0rc1
>>>>>>> Set NPM dependencies more stably
edx-rest-api-client==1.9.2
edx-search==1.2.1
edx-submissions==2.0.12