zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From felixche...@apache.org
Subject incubator-zeppelin git commit: upgrade angularJS from 1.3.x to 1.5.0 (stable)
Date Sat, 26 Mar 2016 00:11:10 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 6bd53d4dd -> df39c022b


upgrade angularJS from 1.3.x to 1.5.0 (stable)

### What is this PR for?
upgrade angularJS from 1.3.x to 1.5.0 (stable)

### What type of PR is it?
Improvement

### Todos
* [x] - Upgrade in bower.json
* [x] - make upgrade change in app.js

### Is there a relevant Jira issue?
N/A

### How should this be tested?
Try `grunt test` on zeppelin-web

### Screenshots (if appropriate)

### Questions:
* Does the licenses files need update?
No
* Is there breaking changes for older versions?
No
* Does this needs documentation?
No

Author: Prabhjyot Singh <prabhjyotsingh@gmail.com>

Closes #783 from prabhjyotsingh/upgradeAngularJS and squashes the following commits:

f87c69b [Prabhjyot Singh] Merge remote-tracking branch 'origin/master' into upgradeAngularJS
d2e600c [Prabhjyot Singh] test empty commit for CI
d3c3340 [Prabhjyot Singh] test empty commit for CI
a5d09e5 [Prabhjyot Singh] Merge remote-tracking branch 'origin/increaseImplicitlyWait' into
upgradeAngularJS
2a51a1f [Prabhjyot Singh] add waitForParagraph(1, "FINISHED"); change assertTrue to waitForParagraph(1,
"FINISHED");
0249b49 [Prabhjyot Singh] replace sendkeys with javascript function
1f422c0 [Prabhjyot Singh] upgrade angularJS from 1.3.x to 1.5.0 (stable)
734a901 [Prabhjyot Singh] increase implicitlyWait for WebDriver


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/df39c022
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/df39c022
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/df39c022

Branch: refs/heads/master
Commit: df39c022bf64fea2c3a15a7552eeabeebe8338da
Parents: 6bd53d4
Author: Prabhjyot Singh <prabhjyotsingh@gmail.com>
Authored: Wed Mar 23 08:32:24 2016 +0530
Committer: Felix Cheung <felixcheung@apache.org>
Committed: Fri Mar 25 17:10:59 2016 -0700

----------------------------------------------------------------------
 .../integration/ParagraphActionsIT.java         |  2 +-
 zeppelin-web/bower.json                         | 20 ++++++++++----------
 zeppelin-web/src/app/app.js                     |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/df39c022/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
index 57a9991..d1135c0 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java
@@ -418,4 +418,4 @@ public class ParagraphActionsIT extends AbstractZeppelinIT {
   }
 
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/df39c022/zeppelin-web/bower.json
----------------------------------------------------------------------
diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json
index 4d68ff1..330c408 100644
--- a/zeppelin-web/bower.json
+++ b/zeppelin-web/bower.json
@@ -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",
@@ -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": {

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/df39c022/zeppelin-web/src/app/app.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/app.js b/zeppelin-web/src/app/app.js
index 33a9daf..ff2be77 100644
--- a/zeppelin-web/src/app/app.js
+++ b/zeppelin-web/src/app/app.js
@@ -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',


Mime
View raw message