--- a/TODO.txt
+++ b/TODO.txt
@@ -1,4 +1,3 @@
-[ ] Paginated log view (like git log --skip=100 --max-count=100)
 [ ] Nag project owners with no commits to the mainline repos after a week or two
 [ ] gitk-style branch view
 [ ] project homepage is an editable wiki-ish page

--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -53,9 +53,24 @@ class BrowseController < ApplicationController
     render :text => @blob.contents, :content_type => "text/plain"
   end
   
+  @@per_page = 30
+  
   def log
     @git = Git.bare(@repository.full_repository_path)
-    # TODO: paginated logs
+    skip = params[:page].blank? ? 0 : (params[:page].to_i-1) * @@per_page
+    @commits = @git.log(30, skip)
+    @tags_per_sha = returning({}) do |hash|
+      @git.tags.each do |tag| 
+        hash[tag.sha] ||= []
+        hash[tag.sha] << tag.name 
+      end
+    end
+    # TODO: Patch rails to keep track of what it responds to so we can DRY this up
+    @atom_auto_discovery_url = project_repository_formatted_browse_path(@project, @repository, :atom)
+    respond_to do |format|
+      format.html
+      format.atom
+    end
   end
   
   def archive

--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -4,6 +4,10 @@ module BrowseHelper
     project_repository_browse_path(@project, @repository)
   end
   
+  def log_path(args={})
+    project_repository_log_path(@project, @repository, args)
+  end
+  
   def tree_path(sha1=nil)
     project_repository_tree_path(@project, @repository, sha1)    
   end

--- /dev/null
+++ b/app/views/browse/_log.html.erb
@@ -0,0 +1,25 @@
+<table class="listing shortlog">
+  <% commits.each do |commit| -%>
+  <tr class="<%= cycle "odd", "even" -%>">
+    <td><%=h commit.date.strftime("%Y-%m-%d %H:%M") -%></td>
+    <td><%=h truncate(commit.author.name, 15) -%></td>
+    <td>
+      <%= link_to h(truncate(commit.message, 85)), commit_path(commit.sha) -%>
+      <%= render_tag_box_if_match(commit.sha, @tags_per_sha) -%>
+    </td>
+    <td><%= link_to "commit", commit_path(commit.sha) -%></td>
+    <td><%= link_to "tree", tree_path(commit.gtree.sha) -%></td>
+    <!-- <td>archive (<%= commit.gtree.sha -%>)</td> -->
+  </tr>
+  <% end -%>
+  <tr>
+    <td colspan="5" class="link_to_more">
+      <span>
+      <% unless params[:page].blank? || [0,1].include?(params[:page].to_i) -%>
+        <%= link_to "&#x2190; previous", log_path(:page => params[:page].to_i-1) -%> | 
+      <% end -%>
+      <%= link_to "next &#x2192;", log_path(:page => (params[:page].blank? ? 2 : params[:page].to_i+1)) -%>
+      </span>
+    </td>
+  </tr>
+</table>
\ No newline at end of file

--- a/app/views/browse/_submenu.html.erb
+++ b/app/views/browse/_submenu.html.erb
@@ -1,6 +1,6 @@
 <% content_for :submenu do -%>
   <ul>
-    <li><%= link_to "&#x2190; shortlog index", project_repository_browse_path(@project, @repository) -%></li>
+    <li><%= link_to "&#x2190; Browse repository", project_repository_browse_path(@project, @repository) -%></li>
     <li><%= link_to "&#x2190; repository page", 
               project_repository_path(@project, @repository) -%></li>
     <li><%= link_to "&#x2190; project page", 

--- a/app/views/browse/index.html.erb
+++ b/app/views/browse/index.html.erb
@@ -11,21 +11,7 @@
 </ul>
 
 <h2>shortlog</h2>
-<table class="listing shortlog">
-  <% @commits.each do |commit| -%>
-  <tr class="<%= cycle "odd", "even" -%>">
-    <td><%=h commit.date.strftime("%Y-%m-%d %H:%M") -%></td>
-    <td><%=h truncate(commit.author.name, 15) -%></td>
-    <td>
-      <%= link_to h(truncate(commit.message, 85)), commit_path(commit.sha) -%>
-      <%= render_tag_box_if_match(commit.sha, @tags_per_sha) -%>
-    </td>
-    <td><%= link_to "commit", commit_path(commit.sha) -%></td>
-    <td><%= link_to "tree", tree_path(commit.gtree.sha) -%></td>
-    <!-- <td>archive (<%= commit.gtree.sha -%>)</td> -->
-  </tr>
-  <% end -%>
-</table>
+<%= render :partial => "log", :locals => {:commits => @commits} -%>
 
 <% content_for :submenu do -%>
 <ul>

--- /dev/null
+++ b/app/views/browse/log.html.erb
@@ -0,0 +1,25 @@
+<h1>
+  Browsing <%= link_to h(@repository.name), project_repository_path(@project, @repository) -%> 
+  repository in <%= link_to h(@project.title), project_path(@project) -%>
+</h1>
+
+<h2>Commit Log</h2>
+<%= render :partial => "log", :locals => {:commits => @commits} -%>
+
+<%= render :partial => "submenu" -%>
+
+<% content_for :sidebar do -%>  
+  <h5>Branches:</h5>
+  <ul class="links">
+    <% @git.branches.each do |branch| -%>
+    <li><%= link_to h(branch.name), commit_path(branch.gcommit.sha) -%></li>
+    <% end -%>
+  </ul>
+
+  <h5>Tags:</h5>
+  <ul class="links">
+  <% @git.tags.each do |tag| -%>
+    <li><%= link_to h(tag.name), commit_path(tag.sha) -%></li>
+  <% end -%>
+  </ul>
+<% end -%>
\ No newline at end of file

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,6 +42,7 @@ ActionController::Routing::Routes.draw do |map|
       repo.with_options(:controller => "browse") do |r|
         r.browse  "browse",       :action => "index"
         r.formatted_browse  "browse.:format",       :action => "index"
+        r.log     "log",        :action => "log"
         r.tree    "tree/:sha",    :action => "tree", :sha => nil
         r.blob    "blob/:sha/:filename", :action => "blob", :requirements => {:filename => /.*/}
         r.raw_blob "raw/:sha/:filename", :action => "raw", :requirements => {:filename => /.*/}

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -517,6 +517,13 @@ span.tag {
 table.shortlog tr td, table.tree tr td {
   padding: 2px 5px 4px 5px;
 }
+table.shortlog tr td.link_to_more {
+  border-top: 1px solid #aaa;
+  padding: 2px;
+}
+table.shortlog tr td.link_to_more span {
+  float:right;
+}
 
 table.tree tr td.node {
   width: 75%;