Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
d8bfac1
Merge remote-tracking branch 'hyperledger/master'
EdProsser Jun 15, 2017
caeedc3
Merge remote-tracking branch 'hyperledger/master'
EdProsser Jun 19, 2017
fd76df6
Merge remote-tracking branch 'hyperledger/master'
EdProsser Jun 29, 2017
2ba0a15
Merge remote-tracking branch 'hyperledger/master'
EdProsser Jun 29, 2017
e8b27d2
Merge remote-tracking branch 'hyperledger/master'
EdProsser Jul 5, 2017
75a6419
Merge remote-tracking branch 'hyperledger/master'
EdProsser Jul 6, 2017
baadf55
v.1 diagnosing and connector specific info
EdProsser Jul 6, 2017
c27ffd6
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 7, 2017
2af32d3
minor update
EdProsser Jul 10, 2017
9b0af8c
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 10, 2017
d23e7b5
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 11, 2017
acd143a
Readmefix, modelling and acl
EdProsser Jul 11, 2017
64a8654
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 13, 2017
bb945fe
Add in shortened accordion ToC
EdProsser Jul 13, 2017
0db3091
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 17, 2017
f3ba941
Merging master changes
EdProsser Jul 17, 2017
a804b1b
System ACL doc
EdProsser Jul 18, 2017
342f269
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 18, 2017
6db6897
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 19, 2017
d42476d
More changes
EdProsser Jul 19, 2017
5fff628
last changes
EdProsser Jul 19, 2017
722b2c7
Merge remote-tracking branch 'hyperledger/master' into 6-7-17-ed
EdProsser Jul 19, 2017
d22fac4
RC -> v1.0, network start, runtime install,
EdProsser Jul 19, 2017
65bc6b2
Adding links to new commands
EdProsser Jul 19, 2017
7cbc2e8
Merge remote-tracking branch 'hyperledger/master' into options-19-7-ed
EdProsser Jul 19, 2017
fd85a0a
Update for modelling lang doc
EdProsser Jul 19, 2017
9c7b51d
hyper ledger fabric endorsing peer
EdProsser Jul 19, 2017
2970c23
Merge remote-tracking branch 'hyperledger/master' into options-19-7-ed
EdProsser Jul 20, 2017
123096f
Merge remote-tracking branch 'hyperledger/master' into options-19-7-ed
EdProsser Jul 20, 2017
7291287
Sort out the Doc titles.
EdProsser Jul 20, 2017
d43405d
Merge remote-tracking branch 'hyperledger/master' into 21-7-ed
EdProsser Jul 20, 2017
80a4b12
Merge remote-tracking branch 'hyperledger/master' into 21-7-ed
EdProsser Jul 24, 2017
82ba2fc
Merge remote-tracking branch 'hyperledger/master' into 21-7-ed
EdProsser Jul 24, 2017
8646954
Support link fixes, API link fixes.
EdProsser Jul 24, 2017
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<!-- <li><a href="https://composer-playground.mybluemix.net" title="Composer">Playground</a></li> -->
<li><a href="{{site.baseurl}}/tutorials/tutorials.html">Tutorials</a></li>
<li><a href="{{site.baseurl}}/introduction/introduction.html">Docs</a></li>
<li><a href="{{site.baseurl}}/support/index.html">Community</a></li>
<li><a href="{{site.baseurl}}/support/support-index.html">Community</a></li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/composer-website/jekylldocs/_includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</li> -->
<a href="../tutorials/tutorials.html">Tutorials</a>
<a href="../introduction/introduction.html">Docs</a>
<a href="../support/index.html">Community</a>
<a href="../support/support-index.html">Community</a>
</div>
</div>
</nav>
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
{% for page in sorted %}
{% if page.index-order %}
{% capture mods %}{{ page.index-order | modulo:100 }}{% endcapture %}
{% if mods == "0" %}
{% if mods == "0" and page.exception == nil %}
- [{{ page.title }}](..{{page.url}}.html)
{% elsif mods != "0" %}
{% elsif mods != "0" and page.exception == nil %}
- [{{page.title}}](..{{page.url}}.html)
{% elsif page.title == "API Documentation" page.exception == API %}
- [API Documentation](../jsdoc/index.html)
{% endif %}
{% endif %}
{% endfor %}
2 changes: 1 addition & 1 deletion packages/composer-website/jekylldocs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h2>Calls happen every Thursday.</h2>
<p><a href="https://chat.hyperledger.org/channel/composer">chat.hyperledger.org</a></p></div>
</div>
</div>
<p>Visit the <a href="{{site.baseurl}}/support/index.html" class="community">community</a> page for more information.</p>
<p>Visit the <a href="{{site.baseurl}}/support/support-index.html" class="community">community</a> page for more information.</p>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: Installing Index
title: Installing Hyperledger Composer
category: tasks
sidebar: sidebars/accordion-toc0.md
section: installing
Expand All @@ -14,7 +14,7 @@ excerpt: Tutorials

{% assign sorted = site.pages | sort: 'index-order' %}
{% for page in sorted %}
{% if page.section == 'installing' and page.title != "Installing Index" %}
{% if page.section == 'installing' and page.title != "Installing" %}
### {{ page.title }}
{{ page.excerpt }}
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ docker images -aq | xargs docker rmi -f

curl -sSL https://hyperledger.github.io/composer/install-hlfv1.sh | bash

2. Access your local {{site.data.conrefs.composer_full}} Playground by clicking this link: <a href="http://localhost:8080" target="blank">http://<span></span>localhost:8080</a>.
2. Access your local {{site.data.conrefs.composer_full}} Playground by clicking this link: <a href="http://localhost:8080" target="blank">http://<span></span>localhost:8080</a>. *Please note*: Private browsing is not supported when running the Playground locally.


## Deploying business networks to {{site.data.conrefs.hlf_full}} v1.0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: Integrating Index
title: Integrating Existing Systems
category: concepts
section: integrating
index-order: 600
Expand All @@ -16,7 +16,7 @@ excerpt: How to create a new Connection Profile

{% assign sorted = site.pages | sort: 'index-order' %}
{% for page in sorted %}
{% if page.section == 'integrating' and page.title != "Integrating Index" %}
{% if page.section == 'integrating' and page.title != "Integrating Existing Systems" %}
### {{ page.title }}
{{ page.excerpt }}
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: Enabling Playground OAuth with GitHub
title: Enabling playground OAuth with GitHub
category: tasks
section: managing
sidebar: sidebars/accordion-toc0.md
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: Managing Index
title: Managing a Deployed Business Network
category: concepts
section: managing
index-order: 700
Expand All @@ -12,7 +12,7 @@ excerpt: "Managing your {{site.data.conrefs.composer_full}}"

{% assign sorted = site.pages | sort: 'index-order' %}
{% for page in sorted %}
{% if page.section == 'managing' and page.title != "Managing Index" %}
{% if page.section == 'managing' and page.title != "Managing a Deployed Business Network" %}
### {{ page.title }}
{{ page.excerpt }}
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: Reference Index
title: Reference
section: reference
index-order: 900
sidebar: sidebars/accordion-toc0.md
Expand All @@ -15,7 +15,7 @@ The {{site.data.conrefs.composer_full}} reference material contains a number of

{% assign sorted = site.pages | sort: 'index-order' %}
{% for page in sorted %}
{% if page.section == 'reference' and page.title != "Reference Index" or page.exception == 'API' %}
{% if page.section == 'reference' and page.title != "Reference" or page.exception == 'API' %}
### {{ page.title }}
{{ page.excerpt }}
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: default
title: Tutorials Index
title: Tutorials
category: tutorials
section: tutorials
sidebar: sidebars/accordion-toc0.md
Expand Down