zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prabhjyotsi...@apache.org
Subject incubator-zeppelin git commit: [Hot Fix] add missing karma.conf.js
Date Mon, 09 May 2016 05:00:17 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 664fa421d -> 1ba0f55b9


[Hot Fix] add missing karma.conf.js

### What is this PR for?
After https://github.com/apache/incubator-zeppelin/pull/761, on compiling project this file
`karma.conf.js` started showing diff.

### What type of PR is it?
[Hot Fix]

### Todos
* [x] - Add karma.conf.js with diff.

### What is the Jira issue?
N/A

### How should this be tested?

### 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 #875 from prabhjyotsingh/datatables_missing_karam_conf and squashes the following commits:

f313878 [Prabhjyot Singh] add missing karma.conf.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/1ba0f55b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/1ba0f55b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/1ba0f55b

Branch: refs/heads/master
Commit: 1ba0f55b9e09d6af048fcda7602dce703ae5793d
Parents: 664fa42
Author: Prabhjyot Singh <prabhjyotsingh@gmail.com>
Authored: Thu May 5 14:31:08 2016 +0530
Committer: Prabhjyot Singh <prabhjyotsingh@gmail.com>
Committed: Mon May 9 10:30:07 2016 +0530

----------------------------------------------------------------------
 zeppelin-web/test/karma.conf.js | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/1ba0f55b/zeppelin-web/test/karma.conf.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/test/karma.conf.js b/zeppelin-web/test/karma.conf.js
index aa128f3..8049ac6 100644
--- a/zeppelin-web/test/karma.conf.js
+++ b/zeppelin-web/test/karma.conf.js
@@ -61,6 +61,14 @@ module.exports = function(config) {
       'bower_components/bootstrap3-dialog/dist/js/bootstrap-dialog.min.js',
       'bower_components/floatThead/dist/jquery.floatThead.js',
       'bower_components/floatThead/dist/jquery.floatThead.min.js',
+      'bower_components/datatables.net/js/jquery.dataTables.js',
+      'bower_components/datatables.net-bs/js/dataTables.bootstrap.js',
+      'bower_components/datatables.net-buttons/js/dataTables.buttons.js',
+      'bower_components/datatables.net-buttons/js/buttons.colVis.js',
+      'bower_components/datatables.net-buttons/js/buttons.flash.js',
+      'bower_components/datatables.net-buttons/js/buttons.html5.js',
+      'bower_components/datatables.net-buttons/js/buttons.print.js',
+      'bower_components/datatables.net-buttons-bs/js/buttons.bootstrap.js',
       'bower_components/angular-mocks/angular-mocks.js',
       // endbower
       'src/app/app.js',


Mime
View raw message