External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix schedules sitewide (#3469)

Browse Source 
* Remove custom rrule module loaders, update angular-scheduler dept

* snip comment

* remove nlp module loaders
This commit is contained in:
Leigh Johnson 2016-09-09 10:49:28 -04:00 committed by Jared Tabor
parent 5801d3cec8
commit cf54fe27e6
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/npm-shrinkwrap.json generated
View File

@ -149,6 +149,11 @@
"version": "3.8.0",
"from": "lodash@>=3.8.0 <3.9.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"
},
"rrule": {
"version": "2.2.0-dev",
"from": "jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c",
"resolved": "git://github.com/jkbrzt/rrule.git#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c"
}
}
},
@ -2832,6 +2837,7 @@
},
"istanbul-lib-coverage": {
"version": "1.0.0",
<<<<<<< 09aef3eb4366affa87873a3722971ca537d105a9
"from": "istanbul-lib-coverage@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz"
},
@ -2839,6 +2845,15 @@
"version": "1.1.3",
"from": "istanbul-lib-instrument@>=1.1.1 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.1.3.tgz"
=======
"from": "istanbul-lib-coverage@>=1.0.0-alpha.4 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz"
},
"istanbul-lib-instrument": {
"version": "1.1.1",
"from": "istanbul-lib-instrument@>=1.1.1 <2.0.0",
"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.1.1.tgz"
>>>>>>> Fix schedules sitewide (#3469)
},
"javascript-detect-element-resize": {
"version": "0.5.3",
@ -3952,11 +3967,6 @@
"from": "ripemd160@0.2.0",
"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"
},
"rrule": {
"version": "2.2.0-dev",
"from": "jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c",
"resolved": "git://github.com/jkbrzt/rrule.git#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c"
},
"rx": {
"version": "4.1.0",
"from": "rx@4.1.0",

1
awx/ui/package.json
View File

@ -99,7 +99,6 @@
"ng-toast": "leigh-johnson/ngToast#2.0.1",
"nvd3": "leigh-johnson/nvd3#1.7.1",
"reconnectingwebsocket": "^1.0.0",
"rrule": "jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c",
"select2": "^4.0.2"
}
}