Fix the ace editor bug. (#946)

* merge the 'zeppelin' app.js to 'trunk'.

* Change button style of rules (#747)

* Add tooltip for action (#765)

* Fix #741 Remove the usage of view

* change button to phglyphicon, start and stop button combine into one

* add tooltip

* add tooltip for rules and actions

* Change home.html (#786)

* Fix #741 Remove the usage of view

* change button to phglyphicon, start and stop button combine into one

* add tooltip

* add tooltip for rules and actions

* change home.html

* change about smart modal content

* Add help for actions (#794)

* #778 Add Rule format description on UI (#810)

* Fix #741 Remove the usage of view

* change button to phglyphicon, start and stop button combine into one

* add tooltip

* add tooltip for rules and actions

* change home.html

* change about smart modal content

* add help for actions

* #778 Add Rule format description on UI

* #778 Add Rule format description on UI

* #778 Add Rule format description on UI

* #778 Add Rule format description on UI

* Add SmartNotebook (#831)

* Add SmartNotebook

* Add SmartNotebook

* Fix build bugs and web UI

* change the home page.

* remove 'zeppelin-web' from 'smart-zeppelin' default module.

* Update the web UI "Smart Manager" to "Smart Storage Manager"

* Add mover and copy view.

* Merge trunk

* Fix the googlefonts build bug.

* Delete the ActionSevice and RuleService from 'smart-server'

* Delete .flattened-pom.xml

* Fix the ace editor's cursor bug.

Author: zhiqiang-mcw

smart-zeppelin/zeppelin-web/bower.json

@@ -2,19 +2,19 @@
   "name": "zeppelin-web",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "1.5.0",
+    "angular": "1.5.7",
     "json3": "~3.3.1",
     "es5-shim": "~3.1.0",
     "bootstrap": "~3.2.0",
-    "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-cookies": "1.5.7",
+    "angular-sanitize": "1.5.7",
+    "angular-animate": "1.5.7",
+    "angular-touch": "1.5.7",
+    "angular-route": "1.5.7",
+    "angular-resource": "1.5.7",
     "angular-bootstrap": "~2.5.0",
     "angular-websocket": "~1.0.13",
-    "ace-builds": "1.2.6",
+    "ace-builds": "1.2.7",
     "angular-ui-ace": "0.1.3",
     "jquery.scrollTo": "~1.4.13",
     "nvd3": "~1.8.5",
@@ -36,7 +36,6 @@
     "github-markdown-css": "^2.4.0",
     "MathJax": "2.7.0",
     "ngclipboard": "^1.1.1",
-    "angular-ui-router": "^1.0.5",
     "moment": "momentjs#^2.18.1",
     "jquery.cookie": "jquery-cookie#^1.4.1",
     "angular-loading-bar": "^0.9.0",
@@ -45,11 +44,10 @@
     "bootstrap-additions": "^0.3.1",
     "angular-strap": "^2.3.12",
     "ng-file-upload": "^12.2.13",
-    "vis": "^4.20.1",
     "angular-ui-select": "^0.19.8"
   },
   "devDependencies": {
-    "angular-mocks": "1.5.0"
+    "angular-mocks": "1.5.7"
   },
   "appPath": "src",
   "overrides": {
@@ -60,13 +58,14 @@
         "src-noconflict/mode-python.js",
         "src-noconflict/mode-sql.js",
         "src-noconflict/mode-markdown.js",
+        "src-noconflict/mode-pig.js",
         "src-noconflict/mode-sh.js",
         "src-noconflict/mode-r.js",
         "src-noconflict/keybinding-emacs.js",
         "src-noconflict/ext-language_tools.js",
         "src-noconflict/theme-chrome.js"
       ],
-      "version": "1.2.6",
+      "version": "1.2.7",
       "name": "ace-builds"
     },
     "highlightjs": {
@@ -79,7 +78,7 @@
     }
   },
   "resolutions": {
-    "ace-builds": "1.2.6",
+    "ace-builds": "1.2.7",
     "angular": ">=1.5.0 <1.6"
   }
 }