You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2014/03/20 10:03:39 UTC
svn commit: r1579567 - /james/hupa/trunk/src/site/resources/demo/index.html
Author: manolo
Date: Thu Mar 20 09:03:39 2014
New Revision: 1579567
URL: http://svn.apache.org/r1579567
Log:
Fix site doc
Modified:
james/hupa/trunk/src/site/resources/demo/index.html
Modified: james/hupa/trunk/src/site/resources/demo/index.html
URL: http://svn.apache.org/viewvc/james/hupa/trunk/src/site/resources/demo/index.html?rev=1579567&r1=1579566&r2=1579567&view=diff
==============================================================================
--- james/hupa/trunk/src/site/resources/demo/index.html (original)
+++ james/hupa/trunk/src/site/resources/demo/index.html Thu Mar 20 09:03:39 2014
@@ -72,14 +72,6 @@ p {
margin-top: 5px;
margin-bottom: 0px;
}
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> constantly changed by manolo
-=======
->>>>>>> constantly changed by manolo
.red {
font-weight: bold;
color: red;
@@ -89,7 +81,6 @@ pre {
font-family: courier;
font-size: 14px;
}
-<<<<<<< HEAD
</style>
<!-- Google Analytics -->
<script type="text/javascript">
@@ -102,29 +93,7 @@ pre {
var s = document.getElementsByTagName('script').item(0); s.parentNode.insertBefore(ga, s);
})();
</script>
-<<<<<<< HEAD
-=======
</style>
->>>>>>> first commit
-=======
->>>>>>> constantly changed by manolo
-=======
-</style>
->>>>>>> first commit
-=======
-</style>
- <!-- Google Analytics -->
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-1384591-1']);
- _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script').item(0); s.parentNode.insertBefore(ga, s);
- })();
- </script>
->>>>>>> constantly changed by manolo
</head>
<body>
@@ -135,86 +104,15 @@ pre {
</div>
<div class='text box'>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- <p>
- <ul>
- <li>Hupa in <a href=/hupa.demo>Demo</a> mode:
-=======
<p>You can select one of our demo instances:
<ul>
<li>Hupa in <b>Demo</b> mode: <a href=/hupa.demo>http</a>:
->>>>>>> first commit
-=======
- <p>
- <ul>
- <li>Hupa in <a href=/hupa.demo>Demo</a> mode:
->>>>>>> constantly changed by manolo
-=======
- <p>You can select one of our demo instances:
- <ul>
- <li>Hupa in <b>Demo</b> mode: <a href=/hupa.demo>http</a>:
->>>>>>> first commit
-=======
- <p>
- <ul>
- <li>Hupa in <a href=/hupa.demo>Demo</a> mode:
->>>>>>> constantly changed by manolo
<ul>
<li>Username is set to <b>'demo'</b> and the password is <b>'demo'</b></li>
<li>Uses a collection of example messages and stub
implementations of IMAP and SMTP servers.</li>
<li>In this instance you can test almost the Hupa features,
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- but emails you send will never reach the addressee.</li>
- </ul></li>
- </li>
-
- <li>Hupa for <b>Gmail</b>: <br/><br/>We have
- <span class='red'>disabled</span> this instance to avoid risks and legal issues.<br/>Nevertheless you can
- <a href="https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war"> download </a>
- the last built of Hupa and run it in your system:
-<pre>
-$ java -jar hupa-0.0.2-SNAPSHOT.war
-</pre>
- Your instance on Hupa:
- <ul>
- <li>Will work with any imap enabled account in gmail.</li>
-=======
- but emails you send will never reach the addressee,
- and message search is not implemented.</li>
-=======
- but emails you send will never reach the addressee.</li>
->>>>>>> constantly changed by manolo
- </ul></li>
- </li>
-
- <li>Hupa for <b>Gmail</b>: <br/><br/>We have
- <span class='red'>disabled</span> this instance to avoid risks and legal issues.<br/>Nevertheless you can
- <a href="https://builds.apache.org/job/hupa-trunk/lastBuild/org.apache.hupa$hupa/artifact/org.apache.hupa/hupa/0.0.2-SNAPSHOT/hupa-0.0.2-SNAPSHOT.war"> download </a>
- the last built of Hupa and run it in your system:
-<pre>
-$ java -jar hupa-0.0.2-SNAPSHOT.war
-</pre>
- Your instance on Hupa:
- <ul>
-<<<<<<< HEAD
- <li>It will work with any imap enabled account in gmail.</li>
->>>>>>> first commit
-=======
- <li>Will work with any imap enabled account in gmail.</li>
->>>>>>> constantly changed by manolo
-=======
- but emails you send will never reach the addressee,
- and message search is not implemented.</li>
-=======
but emails you send will never reach the addressee.</li>
->>>>>>> constantly changed by manolo
</ul></li>
</li>
@@ -227,62 +125,13 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war
</pre>
Your instance on Hupa:
<ul>
-<<<<<<< HEAD
- <li>It will work with any imap enabled account in gmail.</li>
->>>>>>> first commit
-=======
<li>Will work with any imap enabled account in gmail.</li>
->>>>>>> constantly changed by manolo
<li>You have to provide a valid gmail username (don't forget
the domain part) and your password.</li>
<li>Because this instance and gmail servers are far away, and
Hupa caching is not enabled, you will notice a latency when using
the application.</li>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
- <li>You can read your real messages, search them, and use Hupa to reply and send
- messages to your contacts.</li>
- <div class='warn'>
- <p>Like any other email client, Hupa needs your password in order to
- get a secure session with your credentials from gmail servers. </p>
- <p>Hupa uses SSL
- channel to comunicate with gmail. </p>
- <p>In the same way it is recomended that
- you use hupa via https so as the communication between your browser and Hupa
- were not compromissed. </p>
-<!--
- <p>Because this is a demo instance we are using a
- self-signed certificate.</p>
--->
-=======
- <li>You can manage your folders, read your messages, search them, reply and send
-=======
- <li>You can read your real messages, search them, and use Hupa to reply and send
->>>>>>> constantly changed by manolo
- messages to your contacts.</li>
- <div class='warn'>
- <p>Like any other email client, Hupa needs your password in order to
- get a secure session with your credentials from gmail servers. </p>
- <p>Hupa uses SSL
- channel to comunicate with gmail. </p>
- <p>In the same way it is recomended that
- you use hupa via https so as the communication between your browser and Hupa
- were not compromissed. </p>
-<!--
- <p>Because this is a demo instance we are using a
- self-signed certificate.</p>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
--->
->>>>>>> constantly changed by manolo
-=======
<li>You can manage your folders, read your messages, search them, reply and send
-=======
- <li>You can read your real messages, search them, and use Hupa to reply and send
->>>>>>> constantly changed by manolo
messages to your contacts.</li>
<div class='warn'>
<p>Like any other email client, Hupa needs your password in order to
@@ -295,11 +144,7 @@ $ java -jar hupa-0.0.2-SNAPSHOT.war
<!--
<p>Because this is a demo instance we are using a
self-signed certificate.</p>
-<<<<<<< HEAD
->>>>>>> first commit
-=======
-->
->>>>>>> constantly changed by manolo
</div>
</ul></li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org