You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by do...@apache.org on 2014/12/21 20:14:23 UTC
svn commit: r1647191 [1/9] - in /incubator/corinthia/www: ./ css/ img/ js/
js/foundation/ js/vendor/
Author: dortef
Date: Sun Dec 21 19:14:22 2014
New Revision: 1647191
URL: http://svn.apache.org/r1647191
Log:
first version of corinthia site
Added:
incubator/corinthia/www/contribute1.html
incubator/corinthia/www/contribute2.html
incubator/corinthia/www/corinthia.cpf
incubator/corinthia/www/css/
incubator/corinthia/www/css/foundation.css
incubator/corinthia/www/css/foundation.min.css
incubator/corinthia/www/css/normalize.css
incubator/corinthia/www/img/
incubator/corinthia/www/img/incubatorlogo.png (with props)
incubator/corinthia/www/img/owl.jpg (with props)
incubator/corinthia/www/img/webbanner.jpg (with props)
incubator/corinthia/www/js/
incubator/corinthia/www/js/foundation/
incubator/corinthia/www/js/foundation.min.js
incubator/corinthia/www/js/foundation/foundation.abide.js
incubator/corinthia/www/js/foundation/foundation.accordion.js
incubator/corinthia/www/js/foundation/foundation.alert.js
incubator/corinthia/www/js/foundation/foundation.clearing.js
incubator/corinthia/www/js/foundation/foundation.dropdown.js
incubator/corinthia/www/js/foundation/foundation.equalizer.js
incubator/corinthia/www/js/foundation/foundation.interchange.js
incubator/corinthia/www/js/foundation/foundation.joyride.js
incubator/corinthia/www/js/foundation/foundation.js
incubator/corinthia/www/js/foundation/foundation.magellan.js
incubator/corinthia/www/js/foundation/foundation.offcanvas.js
incubator/corinthia/www/js/foundation/foundation.orbit.js
incubator/corinthia/www/js/foundation/foundation.reveal.js
incubator/corinthia/www/js/foundation/foundation.slider.js
incubator/corinthia/www/js/foundation/foundation.tab.js
incubator/corinthia/www/js/foundation/foundation.tooltip.js
incubator/corinthia/www/js/foundation/foundation.topbar.js
incubator/corinthia/www/js/vendor/
incubator/corinthia/www/js/vendor/fastclick.js
incubator/corinthia/www/js/vendor/jquery.cookie.js
incubator/corinthia/www/js/vendor/jquery.js
incubator/corinthia/www/js/vendor/modernizr.js
incubator/corinthia/www/js/vendor/placeholder.js
incubator/corinthia/www/learnmore.html
Modified:
incubator/corinthia/www/index.html
Added: incubator/corinthia/www/contribute1.html
URL: http://svn.apache.org/viewvc/incubator/corinthia/www/contribute1.html?rev=1647191&view=auto
==============================================================================
--- incubator/corinthia/www/contribute1.html (added)
+++ incubator/corinthia/www/contribute1.html Sun Dec 21 19:14:22 2014
@@ -0,0 +1,102 @@
+<!<!doctype html>
+<html class="no-js" lang="en">
+ <head>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>Corinthia | Join the community</title>
+ <link rel="stylesheet" href="css/foundation.css" />
+ <script src="js/vendor/modernizr.js"></script>
+ </head>
+ <body>
+ <div class="fixed">
+ <nav class="top-bar" data-topbar role="navigation">
+ <ul class="title-area"> <li class="name"> <h1><a href=index.html>Home</a></h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> </ul>
+ <section class="top-bar-section">
+ <!-- Right Nav Section -->
+ <ul class="right">
+ <li class="has-dropdown"><a href="#">Community</a>
+ <ul class="dropdown">
+ <li class="active"><a href="contribute1.html">How to contribute</a></li>
+ <li><a href="contribute2.html">Committer guide</a></li>
+ </ul>
+ </li>
+ <li class="has-dropdown"><a href="#">Learn more</a>
+ <ul class="dropdown">
+ <li><a href="learnmore.html">Background</a></li>
+ </ul>
+ </li>
+ <li class><a href="#">Documentation</a></li>
+ </ul>
+ </div>
+ <!-- content section -->
+ <div class="row">
+ <div class="large-12 columns">
+ <div class="float left"><img src="img/owl.jpg" width="250" height="250" alt="" title="" /></div>
+ <h3>How to contribute</h3>
+ <p>Welcome and thank you for your interest in contributing to Apache Corinthia! This guide will take you through the process of making contributions to the
+ Apache Corinthia code base. Contributor license agreement
+ Apache Corinthia is licensed under the Apache License, Version 2.0. All contributions will be under this license, so please read and understand this license
+ before contributing.
+ For all but the most trivial patches, you are required to file a Contributor License Agreement with the Apache Software Foundation. Please read the guide to
+ CLAs to find out how to file a CLA with the Foundation.</p>
+ <h3>Before you start - join the community</h3>
+ <p>If itâs your first contribution or itâs a particularly big or complex contribution, things typically go much more smoothly when they start off with a
+ conversation. Join our development mailing list.
+ <h3>Create an issue in Jira</h3>
+ Your first step is to create or find an issue in Corinthiaâs Jira for your feature request or fix. For small changes this isnât necessary, but itâs good
+ to see if your change fixes an existing issue anyway.</p>
+ <h3>Contributing using GitHub</h3>
+ <p>This is our preferred way for contributing code. Our GitHub repository is located at https://github.com/apache/incubator-corinthia.
+ Your commit messages must properly describes the changes that have been made and their purpose (here are some guidelines). If your contributions fix a
+ Jira issue***, then ensure that you reference the issue (like CORINTHIA-9876***) in the commit message.
+ Create a pull request (PR) in GitHub for the change youâre interested in making. The comment section of the PR must contain a link to the JirA*** issue
+ (if it has one).
+ Some good references for working with GitHub are below. We ask that you keep your change rebased to master as much as possible, and we will ask you to
+ rebase again if master has moved before accepting your patch.</p>
+ <ul><li>Setting Up Git with GitHub</li><li>Forking a Repository</li><li>Submitting Pull Requests</li><li>Rebasing your Branch</li></ul>
+ <p>Finally, add a comment in the Jira issue with a link to the pull request so we know the code is ready to be reviewed.</p>
+ <h3>Reviews</h3>
+ <p>The Apache Corinthia community will review your pull request before it is merged. This process can take a while, so please be patient. If we are slow
+ to respond, please feel free to post a reminder to the mailing list - see the home page to see how to contact us.
+ During the review process you may be asked to make some changes to your submission. While working through feedback, it can be beneficial to create new
+ commits so the incremental change is obvious. This can also lead to a complex set of commits, and having an atomic change per commit is preferred in the end.
+ Use your best judgement and work with your reviewer as to when you should revise a commit or create a new one.
+ A pull request is considered ready to be merged once it gets at lease one +1 from a committer. Once all the changes have been completed and the pull request
+ is accepted, you may be asked to rebase it against the latest code. You may also wish to squash some commits together and make other history revisions, to
+ leave the commit history clean and easily understood.</p>
+ <h3>Contributing without using GitHub</h3>
+ <p>If you prefer to not use GitHub, then that is fine - we are also happy to accept patches attached to a Jira issue. Our canonical repository is located
+ at
+ <div class="panel">https://git-wip-us.apache.org/repos/asf/incubator-corinthia.git;
+ <br>for example: $ git clone https://git-wip-us.apache.org/repos/asf/incubator-corinthia.git</div>
+ When producing patches, please use git format-patch or a similar mechanism - this will ensure that you are properly attributed as the author of the patch
+ when a committer merges it.</p>
+
+ </div></div></div>
+
+
+
+ <!-- footer section -->
+ <div class="row">
+ <div class="large-3 medium-3 columns"><a href=""><img src="img/incubatorlogo.png" width="229" height="57" alt=""
+ title="apache incubator logo" /></a></div>
+ <div class="large-9 medium-9 columns"><p><small>Apache Corinthia is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored
+ by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates
+ that the infrastructure, communications, and decision making process have stabilized in a manner consistent with
+ other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or
+ stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+ Apache Corinthia is distributed under the Apache License v2.0.</small></p>
+ </div>
+ </div>
+
+ <script src="js/vendor/jquery.js"></script>
+ <script src="js/foundation.min.js"></script>
+ <script>
+ $(document).foundation();
+ </script>
+
+
+ </body>
+</html>
\ No newline at end of file
Added: incubator/corinthia/www/contribute2.html
URL: http://svn.apache.org/viewvc/incubator/corinthia/www/contribute2.html?rev=1647191&view=auto
==============================================================================
--- incubator/corinthia/www/contribute2.html (added)
+++ incubator/corinthia/www/contribute2.html Sun Dec 21 19:14:22 2014
@@ -0,0 +1,116 @@
+<!doctype html>
+<html class="no-js" lang="en">
+ <head>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <title>Corinthia | Committer guide</title>
+ <link rel="stylesheet" href="css/foundation.css" />
+ <script src="js/vendor/modernizr.js"></script>
+ </head>
+ <body>
+ <div class="fixed">
+ <nav class="top-bar" data-topbar role="navigation">
+ <ul class="title-area"> <li class="name"> <h1><a href=index.html>Home</a></h1> </li>
+ <!-- Remove the class "menu-icon" to get rid of menu icon. Take out "Menu" to just have icon alone -->
+ <li class="toggle-topbar menu-icon"><a href="#"><span>Menu</span></a></li> </ul>
+ <section class="top-bar-section">
+ <!-- Right Nav Section -->
+ <ul class="right">
+ <li class="has-dropdown"><a href="#">Community</a>
+ <ul class="dropdown">
+ <li><a href="contribute1.html">How to contribute</a></li>
+ <li class="active"><a href="contribute2.html">Committer guide</a></li>
+ </ul>
+ </li>
+ <li class="has-dropdown"><a href="#">Learn more</a>
+ <ul class="dropdown">
+ <li><a href="learnmore.html">Background</a></li>
+ </ul>
+ </li>
+ <li class><a href="#">Documentation</a></li>
+ </ul>
+ </div>
+ <!--content section -->
+ <div class="row">
+ <div class="large-12 columns">
+ <div class="float left"><img src="img/owl.jpg" width="250" height="250" alt="" title="" /></div>
+ <h3>Committer's Guide</h3>
+ <b>TO BE MODIFIED</b>
+ <p>The Apache Corinthia Git repositories are hosted in the ASF infrastructure and mirrored to Github. This is the current
+ repository layout:
+ <br><strong>Apache - the main and official repository GitHub - mirror of the ASF repository, used to accept contributions
+ and do code reviews</strong></p>
+ <h3>Before</h3>
+ <p>For everything except the most trivial changes, the submitter must have a CLA on file. Check the list of Apache committers, and
+ non-commiters with ICLAs on record and prompt the contributor to file an appropriate CLA if required.
+ For all significant changes, there must be a Jira issue. If a Jira issue is not referenced in the PR and/or commit messages, prompt the
+ contributor to open a Jira issue.</p>
+ <h3>Rules of thumb</h3>
+ <ul>
+ <li>Every contribution is a piece of intellectual property.Please treat it with respect.</li>
+ <li>Preserve both the name and email address.This is the precious sustenance that nourishes our project.</li>
+ <li>Ensure your name and email address are there as the committer prior to pushing it to the Apache repositories.</li>
+ <li>Always give credit where it is due, ensure every merged commit reflects properly the individual who authored that commit.</li>
+ </ul>
+ <h3>Setting up your repository</h3>
+ <p>Clone the canonical ASF repo using this command. The --origin option tells git to name the remote apache instead of the default,
+ origin; this will reduce ambiguity when we later add a second remote upstream.</p>
+ <div class="panel">git clone --origin apache https://git-wip-us.apache.org/repos/asf/incubator-corinthia.git</div>
+ <p>Add a second remote, for the GitHub repository.</p>
+ <div class="panel">git remote add github https://github.com/apache/incubator-corinthia.git</div>
+ <p>For the GitHub remote, add an additional fetch reference which will cause every pull request to be made available as a remote
+ branch in your workspace.</p>
+ <div class="panel">git config --local --add remote.github.fetch '+refs/pull/*/head:refs/remotes/github/pr/*'</div>
+ <p>Finally, run git fetch --all to update from all remote repositories - you will see all the pull requests appear:</p>
+ <div class="panel"> [new ref] refs/pull/98/head -> github/pr/98
+ * [new ref] refs/pull/99/head -> github/pr/99</div>
+ <h3>Merging a pull request</h3>
+ <p>Fetch the latest remote branches, which will cause a remote branch for the PR to become available to you.
+ <div class="panel">git fetch --all</div>
+ If you want to inspect the PR and/or run tests, check out the branch:
+ <div class="panel">git checkout github/pr/1234</div>
+ <p>To perform the merge, first update your master branch to the latest:</p>
+ <div class="panel">git checkout master git pull --rebase</div>
+ <p>Then merge and push:</p>
+ <div class="panel">git merge --no-ff -m 'This closes #1234' github/pr/1234 git push apache master</div>
+ <p>Note that this commit message is important, as this is what will trigger the pull request to be automatically closed, and the --no-ff means that a
+ merge commit will always be created.</p>
+ <h3>Alternative options</h3>
+ <h4 class="subheader">Adding the remote reference to the contributorâs repository</h4>
+ <p>Fetch the branch of the user you want to merge from
+ <div class="panel">git fetch https://github.com/user-to-merge-from/incubator-corinthia.git branch-to-merge-from</div>
+ <p>If you commonly merge from a particular user, youâll want to add their repo as a remote to make fetching branches easier.</p>
+ <div class="panel">git remote add user-to-merge-from https://github.com/user-to-merge-from/incubator-corinthia.git
+ <br> git fetch user-to-merge-from</div>
+ <h3>Merging from a patch file</h3>
+ <p>Save the patch from the Github patch link (just append â.patchâ to the pull request link to get it). This patch will keep the authorship of the
+ commit, so we should use it instead of the diff. Apply the patch preserving the original author:</p>
+ <div class="panel">git am pull-request-9876.patch</div>
+ <h3>Additional information</h3>
+ <p>Particularly for new committers, you may find the following information useful:</p>
+ <ul>
+ <li>Guide for new project committers</li>
+ <li>Committers FAQ</li>
+ <li>Git at Apache</li>
+ </ul>
+ </div>
+ </div>
+<!-- footer section -->
+ <div class="row">
+ <div class="large-3 medium-3 columns"><a href=""><img src="img/incubatorlogo.png" width="229" height="57" alt=""
+ title="apache incubator logo" /></a></div>
+ <div class="large-9 medium-9 columns"><p><small>Apache Corinthia is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored
+ by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates
+ that the infrastructure, communications, and decision making process have stabilized in a manner consistent with
+ other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or
+ stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
+ Apache Corinthia is distributed under the Apache License v2.0.</small></p>
+ </div>
+ </div>
+ <script src="js/vendor/jquery.js"></script>
+ <script src="js/foundation.min.js"></script>
+ <script>
+ $(document).foundation();
+ </script>
+ </body>
+</html>
\ No newline at end of file
Added: incubator/corinthia/www/corinthia.cpf
URL: http://svn.apache.org/viewvc/incubator/corinthia/www/corinthia.cpf?rev=1647191&view=auto
==============================================================================
--- incubator/corinthia/www/corinthia.cpf (added)
+++ incubator/corinthia/www/corinthia.cpf Sun Dec 21 19:14:22 2014
@@ -0,0 +1,12 @@
+corinthia
+Version=3
+C:\Users\dorte\Documents\CoffeeCup Software\HTML Editor\Projects
+http://
+
+
+07/12/2014 21:16:21
+NO
+NO
+YES
+YES
+*.html;*.htm;*.vtm;*.vtml;*.asp;*.css;*.shtml;*.phtml;*.php;*.php3;*.xml;*.xsl;*.cfm;*.cfml;*.txt;*.pl;*.cgi;*.snp;*.js;*.vb;*.vbs;*.bas*.mid;*.wav;*.au;*.ra;*.ram;*.bmp;*.gif;*.jpg;*.jpeg;*.png;*.exe;