From 86ba1639c3524536418981469c7d28b3ba7f961f Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 9 Dec 2019 10:43:15 -0500 Subject: [PATCH] Pull in latest version of our angular-scheduler fork to fix Tueday/Tuesday typo --- awx/ui/package-lock.json | 30 +++++------------------------- awx/ui/package.json | 2 +- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/awx/ui/package-lock.json b/awx/ui/package-lock.json index eba5f35816..6719e512e4 100644 --- a/awx/ui/package-lock.json +++ b/awx/ui/package-lock.json @@ -246,10 +246,10 @@ "integrity": "sha512-nB/xe7JQWF9nLvhHommAICQ3eWrfRETo0EVGFESi952CDzDa+GAJ/2BFBNw44QqQPxj1Xua/uYKrbLsOGWZdbQ==" }, "angular-scheduler": { - "version": "git+https://git@github.com/ansible/angular-scheduler.git#7628cb2fc9e6280811baa464f0020a636e65d702", - "from": "git+https://git@github.com/ansible/angular-scheduler.git#v0.3.3", + "version": "git+https://git@github.com/ansible/angular-scheduler.git#a519c52312cb4430a59a8d58e01d3eac3fe5018a", + "from": "git+https://git@github.com/ansible/angular-scheduler.git#v0.4.1", "requires": { - "angular": "~1.6.6", + "angular": "~1.7.2", "angular-tz-extensions": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d", "jquery": "*", "jquery-ui": "*", @@ -258,45 +258,25 @@ "rrule": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c" }, "dependencies": { - "angular": { - "version": "1.6.10", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.6.10.tgz", - "integrity": "sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg==" - }, "angular-tz-extensions": { "version": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d", - "from": "github:ansible/angular-tz-extensions#fc60660f43ee9ff84da94ca71ab27ef0c20fd77d", + "from": "github:ansible/angular-tz-extensions", "requires": { "angular": "~1.7.2", "angular-filters": "^1.1.2", "jquery": "^3.1.0", "jstimezonedetect": "1.0.5", "timezone-js": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f" - }, - "dependencies": { - "angular": { - "version": "1.7.6", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.6.tgz", - "integrity": "sha512-QELpvuMIe1FTGniAkRz93O6A+di0yu88niDwcdzrSqtUHNtZMgtgFS4f7W/6Gugbuwej8Kyswlmymwdp8iPCWg==" - }, - "timezone-js": { - "version": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f", - "from": "github:ansible/timezone-js#0.4.14" - } } }, "lodash": { "version": "3.8.0", - "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz", "integrity": "sha1-N265i9zZOCqTZcM8TLglDeEyW5E=" }, "rrule": { "version": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c", "from": "github:jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c" - }, - "timezone-js": { - "version": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f", - "from": "github:ansible/timezone-js#6937de14ce0c193961538bb5b3b12b7ef62a358f" } } }, diff --git a/awx/ui/package.json b/awx/ui/package.json index 35a12f8646..60e79f0cd1 100644 --- a/awx/ui/package.json +++ b/awx/ui/package.json @@ -107,7 +107,7 @@ "angular-moment": "^1.3.0", "angular-mousewheel": "^1.0.5", "angular-sanitize": "^1.7.9", - "angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.3.3", + "angular-scheduler": "git+https://git@github.com/ansible/angular-scheduler#v0.4.1", "angular-tz-extensions": "git+https://git@github.com/ansible/angular-tz-extensions#v0.5.2", "angular-xeditable": "~0.8.0", "ansi-to-html": "^0.6.3",