Skip to content

upgrade angularJS from 1.3.x to 1.5.0 (stable) #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
prabhjyotsingh wants to merge 8 commits into from
Closed

upgrade angularJS from 1.3.x to 1.5.0 (stable) #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
734a901
increase implicitlyWait for WebDriver
prabhjyotsingh Mar 18, 2016
1f422c0
upgrade angularJS from 1.3.x to 1.5.0 (stable)
prabhjyotsingh Mar 18, 2016
0249b49
replace sendkeys with javascript function
prabhjyotsingh Mar 18, 2016
2a51a1f
add waitForParagraph(1, "FINISHED");
prabhjyotsingh Mar 19, 2016
a5d09e5
Merge remote-tracking branch 'origin/increaseImplicitlyWait' into upg…
prabhjyotsingh Mar 19, 2016
d3c3340
test empty commit for CI
prabhjyotsingh Mar 19, 2016
d2e600c
test empty commit for CI
prabhjyotsingh Mar 19, 2016
f87c69b
Merge remote-tracking branch 'origin/master' into upgradeAngularJS
prabhjyotsingh Mar 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,4 +418,4 @@ public void testShowAndHideLineNumbers() throws Exception {
}


}
}
20 changes: 10 additions & 10 deletions zeppelin-web/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "zeppelin-web",
"version": "0.0.0",
"dependencies": {
"angular": "1.3.8",
"angular": "1.5.0",
"json3": "~3.3.1",
"es5-shim": "~3.1.0",
"bootstrap": "~3.2.0",
"angular-cookies": "1.3.8",
"angular-sanitize": "1.3.8",
"angular-animate": "1.3.8",
"angular-touch": "1.3.8",
"angular-route": "1.3.8",
"angular-resource": "1.3.8",
"angular-cookies": "1.5.0",
"angular-sanitize": "1.5.0",
"angular-animate": "1.5.0",
"angular-touch": "1.5.0",
"angular-route": "1.5.0",
"angular-resource": "1.5.0",
"angular-bootstrap": "~0.13.0",
"angular-websocket": "~1.0.13",
"ace-builds": "1.1.9",
Expand All @@ -20,20 +20,20 @@
"nvd3": "~1.7.1",
"angular-dragdrop": "~1.0.8",
"perfect-scrollbar": "~0.5.4",
"ng-sortable": "~1.1.9",
"ng-sortable": "~1.3.3",
"angular-elastic": "~2.4.2",
"angular-elastic-input": "~2.2.0",
"angular-xeditable": "0.1.8",
"highlightjs": "~8.4.0",
"lodash": "~3.9.3",
"angular-filter": "~0.5.4",
"ngtoast": "~1.5.5",
"ngtoast": "~2.0.0",
"ng-focus-if": "~1.0.2",
"bootstrap3-dialog": "bootstrap-dialog#~1.34.7",
"floatThead": "~1.3.2"
},
"devDependencies": {
"angular-mocks": "1.3.8"
"angular-mocks": "1.5.0"
},
"appPath": "src",
"resolutions": {
Expand Down
4 changes: 2 additions & 2 deletions zeppelin-web/src/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
'use strict';
(function() {
var zeppelinWebApp = angular.module('zeppelinWebApp', [
'ngAnimate',
'ngCookies',
'ngAnimate',
'ngRoute',
'ngSanitize',
'angular-websocket',
'ui.ace',
'ui.bootstrap',
'ui.sortable',
'as.sortable',
'ngTouch',
'ngDragDrop',
'angular.filter',
Expand Down