You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pr...@apache.org on 2016/04/24 20:12:40 UTC
incubator-zeppelin git commit: [ZEPPELIN-799] Modify `index.html` and
`karma.conf.js` for `mode-python`
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master a313e492c -> 9af256ef4
[ZEPPELIN-799] Modify `index.html` and `karma.conf.js` for `mode-python`
### What is this PR for?
Python edit mode was added in #825 thank to astroshim.
I think we'll need to update the `src/index.html` and `test/karma.conf.js` under `zeppelin-web` accordingly to avoid unstaged changes after building.
### What type of PR is it?
Improvement
### Todos
None
### What is the Jira issue?
Probably a subtask of
https://issues.apache.org/jira/browse/ZEPPELIN-799
### How should this be tested?
Shouldn't be any since #825 is merged into `master` and has been tested.
### Screenshots (if appropriate)
N/A
### Questions:
* Does the licenses files need update? *no*
* Is there breaking changes for older versions? *no*
* Does this needs documentation? *no*
/cc astroshim
Author: Cheng-Yu Hsu <m...@cyhsu.me>
Closes #851 from cyhsutw/update-template-files and squashes the following commits:
24901cc [Cheng-Yu Hsu] add `mode-python` to generated html and js
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/9af256ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/9af256ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/9af256ef
Branch: refs/heads/master
Commit: 9af256ef4dcf3970fac4ba296e36a079a086e41a
Parents: a313e49
Author: Cheng-Yu Hsu <m...@cyhsu.me>
Authored: Fri Apr 22 13:40:55 2016 +0800
Committer: Prabhjyot Singh <pr...@gmail.com>
Committed: Sun Apr 24 23:42:28 2016 +0530
----------------------------------------------------------------------
zeppelin-web/src/index.html | 1 +
zeppelin-web/test/karma.conf.js | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/9af256ef/zeppelin-web/src/index.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html
index 5c3a8ad..f5be3ea 100644
--- a/zeppelin-web/src/index.html
+++ b/zeppelin-web/src/index.html
@@ -105,6 +105,7 @@ limitations under the License.
<script src="bower_components/angular-websocket/angular-websocket.min.js"></script>
<script src="bower_components/ace-builds/src-noconflict/ace.js"></script>
<script src="bower_components/ace-builds/src-noconflict/mode-scala.js"></script>
+ <script src="bower_components/ace-builds/src-noconflict/mode-python.js"></script>
<script src="bower_components/ace-builds/src-noconflict/mode-sql.js"></script>
<script src="bower_components/ace-builds/src-noconflict/mode-markdown.js"></script>
<script src="bower_components/ace-builds/src-noconflict/mode-sh.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/9af256ef/zeppelin-web/test/karma.conf.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/test/karma.conf.js b/zeppelin-web/test/karma.conf.js
index 320492f..aa128f3 100644
--- a/zeppelin-web/test/karma.conf.js
+++ b/zeppelin-web/test/karma.conf.js
@@ -34,6 +34,7 @@ module.exports = function(config) {
'bower_components/angular-websocket/angular-websocket.min.js',
'bower_components/ace-builds/src-noconflict/ace.js',
'bower_components/ace-builds/src-noconflict/mode-scala.js',
+ 'bower_components/ace-builds/src-noconflict/mode-python.js',
'bower_components/ace-builds/src-noconflict/mode-sql.js',
'bower_components/ace-builds/src-noconflict/mode-markdown.js',
'bower_components/ace-builds/src-noconflict/mode-sh.js',