Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5665dcf
Fix wrong HTML tags, indention and space between paragraph and tables…
yoonjs2 Jan 17, 2016
5b091e4
Fix wrong HTML tags, indention and space between paragraph and tables…
yoonjs2 Jan 17, 2016
4d1503a
Merge remote-tracking branch 'origin/master'
yoonjs2 Jan 17, 2016
5f0a6e0
Merge remote-tracking branch 'origin/master'
yoonjs2 Jan 17, 2016
079480f
Merge remote-tracking branch 'origin/master'
yoonjs2 Jan 17, 2016
af55811
Merge remote-tracking branch 'origin/master'
yoonjs2 Jan 17, 2016
781954b
Interpreter documentation merge with commit #578
yoonjs2 Jan 17, 2016
db8b4da
Merge remote-tracking branch 'upstream/master'
yoonjs2 Jan 17, 2016
eba0315
Merge remote-tracking branch 'upstream/master'
yoonjs2 Jan 19, 2016
3d9e5b3
Merge remote-tracking branch 'upstream/master'
yoonjs2 Mar 14, 2016
aac4cd4
Add documentation for explaining enable HTTP basic authentication ser…
yoonjs2 Mar 14, 2016
4b2223a
Make path to cert and key for HTTPS Ambigious
yoonjs2 Mar 14, 2016
35a6679
Merge branch 'master' of https://github.com/apache/incubator-zeppelin
yoonjs2 Mar 15, 2016
90219f7
Merge branch 'master' of https://github.com/apache/incubator-zeppelin
yoonjs2 Mar 21, 2016
6d04fa7
Merge branch 'master' of https://github.com/apache/incubator-zeppelin
yoonjs2 Apr 9, 2016
6a5a3c8
Merge branch 'master' of https://github.com/apache/incubator-zeppelin
yoonjs2 Apr 18, 2016
7525167
Merge branch 'master' of https://github.com/apache/incubator-zeppelin
yoonjs2 May 8, 2016
79472d1
Update master branch from upstream
yoonjs2 May 17, 2016
e874a12
Merge branch 'master' of https://github.com/apache/incubator-zeppelin
yoonjs2 Jun 12, 2016
d3a2d50
Apply patch from #995 to enable anchor.js feature
yoonjs2 Jun 12, 2016
ff08605
Fix links for storage documentation using anchors
yoonjs2 Jun 12, 2016
3a19839
Merge branch 'master' of https://github.com/apache/incubator-zeppelin
yoonjs2 Jun 14, 2016
8163109
Merge branch 'master' into fix-navigation-for-storage-doc
yoonjs2 Jun 14, 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
8 changes: 4 additions & 4 deletions docs/_includes/themes/zeppelin/_navigation.html
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,10 +81,10 @@
<li><a href="{{BASE_PATH}}/manual/notebookashomepage.html">Notebook as Homepage</a></li>
<li role="separator" class="divider"></li>
<!-- li><span><b>Notebook Storage</b><span></li -->
<li><a href="{{BASE_PATH}}/storage/storage.html#Git">Git Storage</a></li>
<li><a href="{{BASE_PATH}}/storage/storage.html#S3">S3 Storage</a></li>
<li><a href="{{BASE_PATH}}/storage/storage.html#Azure">Azure Storage</a></li>
<li><a href="{{BASE_PATH}}/storage/storage.html#ZeppelinHub">ZeppelinHub Storage</a></li>
<li><a href="{{BASE_PATH}}/storage/storage.html#toc_1">Git Storage</a></li>
<li><a href="{{BASE_PATH}}/storage/storage.html#toc_2">S3 Storage</a></li>
<li><a href="{{BASE_PATH}}/storage/storage.html#toc_6">Azure Storage</a></li>
<li><a href="{{BASE_PATH}}/storage/storage.html#toc_7">ZeppelinHub Storage</a></li>
<li role="separator" class="divider"></li>
<!-- li><span><b>REST API</b><span></li -->
<li><a href="{{BASE_PATH}}/rest-api/rest-interpreter.html">Interpreter API</a></li>
Expand Down
8 changes: 4 additions & 4 deletions docs/storage/storage.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,7 +31,7 @@ By default, only first two of them will be automatically kept in sync by Zeppeli

</br>

## Notebook Storage in local Git repository <a name="Git"></a>
## Notebook Storage in local Git repository

To enable versioning for all your local notebooks though a standard Git repository - uncomment the next property in `zeppelin-site.xml` in order to use GitNotebookRepo class:

Expand All@@ -45,7 +45,7 @@ To enable versioning for all your local notebooks though a standard Git reposito

</br>

## Notebook Storage in S3 <a name="S3"></a>
## Notebook Storage in S3

Notebooks may be stored in S3, and optionally encrypted. The [``DefaultAWSCredentialsProviderChain``](https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html) credentials provider is used for credentials and checks the following:

Expand DownExpand Up@@ -142,7 +142,7 @@ Or using the following setting in **zeppelin-site.xml**:
```

</br>
## Notebook Storage in Azure <a name="Azure"></a>
## Notebook Storage in Azure

Using `AzureNotebookRepo` you can connect your Zeppelin with your Azure account for notebook storage.

Expand DownExpand Up@@ -205,7 +205,7 @@ Optionally, you can specify Azure folder structure name in the file **zeppelin-s
```

</br>
## Storage in ZeppelinHub <a name="ZeppelinHub"></a>
## Storage in ZeppelinHub

ZeppelinHub storage layer allows out of the box connection of Zeppelin instance with your ZeppelinHub account. First of all, you need to either comment out the following property in **zeppelin-site.xml**:

Expand Down
4 changes: 4 additions & 0 deletions zeppelin-web/src/app/home/home.controller.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,4 +65,8 @@ angular.module('zeppelinWebApp').controller('HomeCtrl', function($scope, noteboo
node.hidden = !node.hidden;
};

$rootScope.noteName = function(note) {
return arrayOrderingSrv.getNoteName(note);
};

});