You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2016/05/09 14:04:23 UTC

[1/2] incubator-quarks-website git commit: Added Wiki to menu

Repository: incubator-quarks-website
Updated Branches:
  refs/heads/master 4a87c1bd8 -> 93f231df8


Added Wiki to menu


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/commit/0d6896b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/0d6896b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/0d6896b2

Branch: refs/heads/master
Commit: 0d6896b259767659c14920b9d280ce152a135795
Parents: 06971cb
Author: kathyssaunders <os...@gmail.com>
Authored: Wed May 4 10:57:48 2016 -0700
Committer: kathyssaunders <os...@gmail.com>
Committed: Wed May 4 10:57:48 2016 -0700

----------------------------------------------------------------------
 site/_includes/header.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/0d6896b2/site/_includes/header.html
----------------------------------------------------------------------
diff --git a/site/_includes/header.html b/site/_includes/header.html
index ce67b93..d17fe0e 100755
--- a/site/_includes/header.html
+++ b/site/_includes/header.html
@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 {% endcomment %}
 -->
- 
+
 
 <section id="home">
 <!-- Header -->
@@ -35,7 +35,7 @@ limitations under the License.
 				</div>
                 <div class="col-lg-6 vcenter">
                     <div class="intro-message">
-						
+
                         <!-- <h1>{{ page.title }}</h1> -->
 						<h2>{{ page.subTitle }}</h2>
 						<!-- <hr class="intro-divider"> -->
@@ -57,7 +57,7 @@ limitations under the License.
     <nav  id="nav-container" class="navbar navbar-inverse " role="navigation">
         <div class="container">
             <!-- Brand and toggle get grouped for better mobile display -->
-           
+
             <div class="navbar-header page-scroll">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
                     <span class="sr-only">Toggle navigation</span>
@@ -82,6 +82,7 @@ limitations under the License.
                         <li><a href="https://issues.apache.org/jira/browse/QUARKS">Issue Tracker</a></li>
                         <li><a href="{{ site.sourceurl }}/">Source Code</a></li>
                         <li><a href="docs/committers">Committers</a></li>
+                        <li><a href="https://cwiki.apache.org/confluence/display/QUARKS/Apache+Quarks+Wiki+Home">Wiki</a></li>
                       </ul>
                     </li>
                     <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Getting Started</a>


[2/2] incubator-quarks-website git commit: Merge pull request #59

Posted by dl...@apache.org.
Merge pull request #59

This closes #59


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/commit/93f231df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/tree/93f231df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/diff/93f231df

Branch: refs/heads/master
Commit: 93f231df84054592b1740dc23fb61e83a5e1c30e
Parents: 4a87c1b 0d6896b
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Mon May 9 10:04:23 2016 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Mon May 9 10:04:23 2016 -0400

----------------------------------------------------------------------
 site/_includes/header.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks-website/blob/93f231df/site/_includes/header.html
----------------------------------------------------------------------