Permalink
Browse files

Merge branch 'master' of git://github.com/pr1001/lift-site

  • Loading branch information...
2 parents 5ae793f + baf2841 commit e65405e6adf1b82f64ad9687f514de4db004d407 @tjweir committed May 16, 2010
Showing with 12 additions and 6 deletions.
  1. +1 −1 site/10_release.html
  2. +1 −1 site/download.html
  3. +8 −2 site/index.html
  4. +1 −1 site/quotes.html
  5. +1 −1 site/team.html
View
@@ -30,7 +30,7 @@
<li><a href="download.html">Download</a></li>
<li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
- <li><a href="http://wiki.github.com/dpp/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
+ <li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>
</ol>
<div id="top-home"></div>
View
@@ -32,7 +32,7 @@
<li><a href="download.html">Download</a></li>
<li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
- <li><a href="http://wiki.github.com/dpp/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
+ <li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>
</ol>
<div id="top-home"></div>
View
@@ -51,7 +51,7 @@
<a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a>
</li>
<li>
- <a href="http://wiki.github.com/dpp/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a>
+ <a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a>
</li>
<li>
<a href="team.html">Team</a>
@@ -96,6 +96,12 @@
News
</h1>
<h2>
+ Lift 2.0 Progressing
+ </h2>
+ <p>
+ 2010/05/15 - Lift 2.0 is under active development and the Lift community released Milestone 5 on May 5. Lift 2.0 will be released after Scala 2.8 is released. Please see the <a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Lift</a> and <a href="http://groups.google.com/group/lift-announce">Lift Announce</a> Google Groups for more news.<br />
+ </p>
+ <h2>
<a href="10_release.html">Lift 1.0 Released!</a>
</h2>
<p>
@@ -145,7 +151,7 @@
</li>
<li>Django's "more than just CRUD is included"
</li>
- <li>Wicket's designer-friendly templating style (see <a href="http://wiki.liftweb.net/index.php?title=Lift_View_First">Lift View First</a>)
+ <li>Wicket's designer-friendly templating style (see <a href="http://www.assembla.com/wiki/show/liftweb/View_First">Lift View First</a>)
</li>
</ul>
<p>
View
@@ -32,7 +32,7 @@
<li><a href="download.html">Download</a></li>
<li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
- <li><a href="http://wiki.github.com/dpp/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
+ <li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>
</ol>
<div id="top-home"></div>
View
@@ -32,7 +32,7 @@
<li><a href="download.html">Download</a></li>
<li><a href="http://main.scala-tools.org/mvnsites/liftweb-2.0-M5/framework/" onclick="javascript:pageTracker._trackPageview('/api-documentation');">API Documentation</a></li>
<li><a href="http://groups.google.com/group/liftweb" onclick="javascript:pageTracker._trackPageview('/community');">Community</a></li>
- <li><a href="http://wiki.github.com/dpp/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
+ <li><a href="http://www.assembla.com/wiki/show/liftweb" onclick="javascript:pageTracker._trackPageview('/wiki');">Wiki</a></li>
<li><a href="team.html">Team</a></li>
</ol>
<div id="top-home"></div>

0 comments on commit e65405e

Please sign in to comment.