--- a/TODO.txt
+++ b/TODO.txt
@@ -1,3 +1,16 @@
+events:
+* need to create user-less events even we don't find matching users, otherwise it gets weird whenever there's commits from non-registered gitorious users (or users commit from another email).
+- maybe save name+email in events table in that case, so we can hook them up to a user later if needed.
+* .hooks symlink need to go to $deploy_to/current, not the release dir
+
+new-ui:
+* show outstanding mergerequests on dashboard
+* mandatory project descriptions, at least a sentence or two
+* tweak fonts-sizes and line-heights
+* Clone stats graph on repositories#index
+* popular & active projects on frontpage
+* make the top-header smaller (move gitorious logo to footer?)
+
 (in no particular order)
 
 two from Yurii:
@@ -6,8 +19,6 @@ two from Yurii:
 
 * tree browser: deal better with funny characters: http://gitorious.org/projects/avara/repos/mainline/trees/master
 * if you comment on a specific commit, you should get redirected back there
-* graphs should show username (if we have it) for avoiding confusion and for consistency
-** Repository#commit_graph_data_by_author should just use git-shortlog summary instead of jumping through hoops about it
 
 >  If you do `git archive --format=tar --prefix=myproject/ HEAD | gzip >
 >  myproject.tar.gz`, when .gitattributes specifies files that have
@@ -16,7 +27,6 @@ two from Yurii:
 >  it'd be pretty nice if it did.
 
 * Deal gracefully with markdown errors (and/or look into using the other markdown libary instead)
-* Don't generate graphs with big "No Data", text even if there's no data
 * Markdownify atom feed body for projects.atom
 * Make the fact that you _can_ clone/fork any repo more visible, maybe reword it since people confuse it with local cloning
 * Show the most recent mergerequests on users dashboard so they can track them
@@ -32,7 +42,6 @@ two from Yurii:
 * Nicer diff stats
 * more interesting project stats on frontpage
 * parse git submodule data and link to project if submodule is in gitorious
-* link to users in gitorious in commmits if email match
 * add mainline as a remote branch in clones
 * timezone support
 * Email source_repository owner about merge_request changes

--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -29,6 +29,7 @@ class CommentsController < ApplicationController
     @comment.project = @project
     respond_to do |format|
       if @comment.save
+        @project.create_event(Action::COMMENT, @comment, current_user)
         format.html do
           flash[:success] = "Your comment was added"
           redirect_to project_repository_comments_path(@project, @repository)

--- a/app/controllers/committers_controller.rb
+++ b/app/controllers/committers_controller.rb
@@ -21,6 +21,8 @@ class CommittersController < ApplicationController
 
     respond_to do |format|
       if @repository.add_committer(@committer)
+        @committership = @repository.committerships.find_by_user_id(@committer.id)
+        @project.create_event(Action::ADD_COMMITTER, @committership, current_user)
         format.html { redirect_to([@repository.project, @repository]) }
         format.xml do 
           render :xml => @committer
@@ -38,6 +40,7 @@ class CommittersController < ApplicationController
     
     respond_to do |format|
       if @committership.destroy
+        @project.create_event(Action::REMOVE_COMMITTER, @repository, current_user, params[:id])
         flash[:success] = "User removed from repository"
         format.html { redirect_to [@repository.project, @repository] }
         format.xml  { render :nothing, :status => :ok }

--- /dev/null
+++ b/app/controllers/events_controller.rb
@@ -0,0 +1,13 @@
+class EventsController < ApplicationController
+  def index
+    @events = Event.paginate(:all, :order => "events.created_at desc", 
+                  :page => params[:page], :include => [:user])
+    @atom_auto_discovery_url = formatted_events_path(:atom)
+    
+    respond_to do |if_format_is|
+      if_format_is.html {}
+      if_format_is.atom {}
+    end
+  end
+  
+end

--- a/app/controllers/merge_requests_controller.rb
+++ b/app/controllers/merge_requests_controller.rb
@@ -31,6 +31,7 @@ class MergeRequestsController < ApplicationController
     @merge_request.user = current_user
     respond_to do |format|
       if @merge_request.save
+        @project.create_event(Action::REQUEST_MERGE, @merge_request, current_user)
         format.html {
           flash[:success] = %Q{You sent a merge request to "#{@merge_request.target_repository.name}"}
           redirect_to project_repository_path(@project, @repository) and return
@@ -50,6 +51,7 @@ class MergeRequestsController < ApplicationController
     # TODO: put to change status
     @merge_request.status = params[:merge_request][:status]
     if @merge_request.save
+      @project.create_event(Action::RESOLVE_MERGE_REQUEST, @merge_request, current_user)
       flash[:notice] = "The merge request was marked as #{@merge_request.status_string}"
     end
     redirect_to [@project, @repository, @merge_request]      
@@ -62,6 +64,7 @@ class MergeRequestsController < ApplicationController
   def update
     @merge_request.attributes = params[:merge_request]
     if @merge_request.save
+      @project.create_event(Action::UPDATE_MERGE_REQUEST, @merge_request, current_user)
       flash[:success] = "Merge request was updated"
       redirect_to [@project, @repository, @merge_request]
     else
@@ -72,6 +75,7 @@ class MergeRequestsController < ApplicationController
   
   def destroy
     @merge_request.destroy
+    @project.create_event(Action::DELETE_MERGE_REQUEST, @repository, current_user)
     flash[:success] = "Merge request was retracted"
     redirect_to project_repository_path(@project, @repository)
   end

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -31,11 +31,16 @@ class ProjectsController < ApplicationController
   
   def show
     @project = Project.find_by_slug!(params[:id], :include => [:repositories])
-    @repositories = @project.repositories
+    @mainline_repository = @project.mainline_repository
+    @repositories = @project.repository_clones
+    @events = @project.events.paginate(:all, :page => params[:page], 
+      :order => "created_at desc", :include => [:user, :project])
+    @atom_auto_discovery_url = formatted_project_path(@project, :atom)
     
     respond_to do |format|
       format.html
-      format.xml { render :xml => @project }
+      format.xml  { render :xml => @project }
+      format.atom { }
     end
   end
   
@@ -46,6 +51,7 @@ class ProjectsController < ApplicationController
     @project = Project.new(params[:project])
     @project.user = current_user
     if @project.save
+      @project.create_event(Action::CREATE_PROJECT, @project, current_user)
       redirect_to projects_path
     else
       render :action => 'new'
@@ -64,6 +70,7 @@ class ProjectsController < ApplicationController
     end
     @project.attributes = params[:project]
     if @project.save
+      @project.create_event(Action::UPDATE_PROJECT, @project, current_user)
       redirect_to project_path(@project)
     else
       render :action => 'new'
@@ -77,7 +84,9 @@ class ProjectsController < ApplicationController
   def destroy
     @project = Project.find_by_slug!(params[:id])
     if @project.can_be_deleted_by?(current_user)
+      project_title = @project.title
       @project.destroy
+      #current_user.create_event(Action::DELETE_PROJECT, nil, project_title)
     else
       flash[:error] = "You're not the owner of this project, or the project has clones"
     end

--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -6,24 +6,19 @@ class RepositoriesController < ApplicationController
   session :off, :only => [:writable_by]
   
   def index
-    redirect_to(project_path(@project))
+    @repositories = @project.repositories.find(:all, :include => [:user, :events, :project])
   end
     
   def show
     @repository = @project.repositories.find_by_name!(params[:id])
-    @comment_count = @repository.comments.count
-    @merge_request_count = @repository.merge_requests.count_open
-    if @repository.has_commits?
-      @commits = @repository.paginated_commits(@repository.head_candidate.name, page=1)
-    else
-      @commits = []
-    end
+    @events = @repository.events.paginate(:all, :page => params[:page], 
+      :order => "created_at desc")
     
     @atom_auto_discovery_url = formatted_project_repository_path(@project, @repository, :atom)
     respond_to do |format|
       format.html
       format.xml  { render :xml => @repository }
-      format.atom { render :template => "logs/feed.atom.builder" }
+      format.atom {  }
     end
   end
   
@@ -61,6 +56,8 @@ class RepositoriesController < ApplicationController
     
     respond_to do |format|
       if @repository.save
+        @project.create_event(Action::CLONE_REPOSITORY, @repository, current_user, @repository_to_clone.id)
+        
         location = project_repository_path(@project, @repository)
         format.html { redirect_to location }
         format.xml  { render :xml => @repository, :status => :created, :location => location }        
@@ -89,8 +86,10 @@ class RepositoriesController < ApplicationController
   def destroy
     @repository = @project.repositories.find_by_name!(params[:id])
     if @repository.can_be_deleted_by?(current_user)
+      repo_name = @repository.name
       flash[:notice] = "The repository was deleted"
       @repository.destroy
+      @project.create_event(Action::DELETE_REPOSITORY, @project, current_user, repo_name)
     else
       flash[:error] = "You're not the owner of this repository"
     end

--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -7,14 +7,14 @@ class SiteController < ApplicationController
   
   def dashboard
     @projects = current_user.projects
-    project_ids = @projects.map(&:id)
-    @recent_comments = Comment.find(:all, :limit => 10,
-      :conditions => ["comments.project_id in (?)", project_ids], 
-      :order => "comments.created_at desc", :include => [:user, :repository])
-    @repository_clones = Repository.find(:all, :order => "created_at desc",
-      :conditions => ["project_id in (?) and mainline = ?", project_ids, false])
-    
-    @repositories = current_user.repositories.find(:all, :conditions => ["mainline = ?", false])
+    @repositories = current_user.repositories.find(:all, 
+      :conditions => ["mainline = ?", false])
+    event_project_ids = (@projects.map(&:id) + @repositories.map(&:project_id)).uniq
+    @events = Event.paginate(:all, 
+      :page => params[:page],
+      :conditions => ["events.project_id in (?)", event_project_ids], 
+      :order => "events.created_at desc", 
+      :include => [:user, :project])    
   end
   
   def about

--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -7,10 +7,28 @@ class UsersController < ApplicationController
     @user = User.find_by_login!(params[:id])
     @projects = @user.projects.find(:all, :include => [:tags, { :repositories => :project }])
     @repositories = @user.repositories.find(:all, :conditions => ["mainline = ?", false])
+    @events = @user.events.paginate(:all, 
+      :page => params[:page],
+      :order => "events.created_at desc", 
+      :include => [:user, :project])
     
-    @commits_last_week = 0
-    @projects.map{|p| p.repositories.first }.concat(@repositories).each do |repo|
-      @commits_last_week += repo.count_commits_from_last_week_by_user(@user)
+    @commits_last_week = @user.events.count(:all, 
+      :conditions => ["created_at > ? AND action = ?", 7.days.ago, Action::COMMIT])
+    @atom_auto_discovery_url = formatted_feed_user_path(@user, :atom)
+    
+    respond_to do |format|
+      format.html { }
+      format.atom { redirect_to formatted_feed_user_path(@user, :atom) }
+    end
+  end
+  
+  def feed
+    @user = User.find_by_login!(params[:id])
+    @events = @user.events.find(:all, :order => "events.created_at desc", 
+      :include => [:user, :project], :limit => 30)
+    respond_to do |format|
+      format.html { redirect_to user_path(@user) }
+      format.atom { }
     end
   end
 

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,6 +2,11 @@
 module ApplicationHelper
   include TagsHelper
   
+  def feed_icon(url, alt_title = "Atom feed", size = :small)
+    link_to image_tag("feed_12.png", :class => "feed_icon"), url, 
+      :alt => alt_title, :title => alt_title
+  end
+  
   def default_css_tag_sizes
     %w(tag_size_1 tag_size_2 tag_size_3 tag_size_4)
   end
@@ -38,6 +43,20 @@ module ApplicationHelper
     end
   end
   
+  def submenu_selected_class_if_current?(section)
+    case section
+    when :overview
+     if %w[projects].include?(controller.controller_name )
+       return "selected"
+     end
+    when :repositories
+      if %w[repositories trees logs commits comitters comments merge_requests 
+            blobs committers].include?(controller.controller_name )
+        return "selected"
+      end
+    end
+  end
+  
   def link_to_with_selected(name, options = {}, html_options = nil)
     html_options = current_page?(options) ? {:class => "selected"} : nil
     link_to(name, options = {}, html_options)
@@ -101,4 +120,129 @@ module ApplicationHelper
       image_tag("graphs/#{filename}")
     end
   end
+  
+  def action_and_body_for_event(event)
+    target = event.target
+    action = ""
+    body = ""
+    category = ""
+    case event.action
+      when Action::CREATE_PROJECT
+        action = "<strong>created project</strong> #{link_to h(target.title), project_path(target)}"
+        body = truncate(target.stripped_description, 100)
+        category = "project"
+      when Action::DELETE_PROJECT
+        action = "<strong>deleted project</strong> #{h(event.data)}"
+        category = "project"
+      when Action::UPDATE_PROJECT
+        action = "<strong>updated project</strong> #{link_to h(target.title), project_path(target)}"
+        category = "project"
+      when Action::CLONE_REPOSITORY
+        original_repo = Repository.find_by_id(event.data.to_i)
+        next if original_repo.nil?
+        
+        project = target.project
+        
+        action = "<strong>cloned</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(original_repo.name), project_repository_url(project, original_repo)} in #{link_to h(target.name), project_repository_url(project, target)}"
+        category = "repository"
+      when Action::DELETE_REPOSITORY
+        action = "<strong>deleted repository</strong> #{link_to h(target.title), project_path(target)}/#{event.data}"
+        category = "project"
+      when Action::COMMIT
+        project = event.project
+        action = "<strong>committed</strong> #{link_to event.data[0,8], project_repository_commit_path(project, target, event.data)} to #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        body = link_to(h(truncate(event.body, 150)), project_repository_commit_path(project, target, event.data))
+        category = "commit"
+      when Action::CREATE_BRANCH
+        project = target.project
+        if event.data == "master"
+          action = "<strong>started development</strong> of #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+          body = event.body
+        else
+          action = "<strong>created branch</strong> #{link_to h(event.data), project_repository_tree_path(project, target, event.data)} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        end
+        category = "commit"
+      when Action::DELETE_BRANCH
+        project = target.project
+        action = "<strong>deleted branch</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        category = "commit"
+      when Action::CREATE_TAG
+        project = target.project
+        action = "<strong>tagged</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        body = "#{link_to event.data, project_repository_commit_path(project, target, event.data)}<br/>#{event.body}"
+        category = "commit"
+      when Action::DELETE_TAG
+        project = target.project
+        action = "<strong>deleted tag</strong> #{event.data} on #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        category = "commit"
+      when Action::ADD_COMMITTER
+        user = target.user
+        repo = target.repository
+        action = "<strong>added committer</strong> #{link_to user.login, user_path(user)} to #{link_to h(repo.project.slug), project_path(repo.project)}/#{link_to h(repo.name), project_repository_url(repo.project, repo)}"
+        category = "repository"
+      when Action::REMOVE_COMMITTER
+        user = User.find_by_id(event.data.to_i)
+        next unless user
+        
+        project = target.project
+        action = "<strong>removed committer</strong> #{link_to user.login, user_path(user)} from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        category = "repository"
+      when Action::COMMENT
+        project = target.project
+        repo = target.repository
+        
+        action = "<strong>commented</strong> on #{link_to h(project.slug), project_path(project)}/#{link_to h(repo.name), project_repository_url(project, repo)}"
+        body = truncate(h(target.body), 150)
+        category = "comment"
+      when Action::REQUEST_MERGE
+        source_repository = target.source_repository
+        project = source_repository.project
+        target_repository = target.target_repository
+        
+        action = "<strong>requested a merge of</strong> #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)} with #{link_to h(project.slug), project_path(project)}/#{link_to h(target_repository.name)}"
+        body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}"
+        category = "merge_request"
+      when Action::RESOLVE_MERGE_REQUEST
+        source_repository = target.source_repository
+        project = source_repository.project
+        target_repository = target.target_repository
+        
+        action = "<strong>resolved merge request</strong> as [#{target.status_string}] from #{link_to h(project.slug), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}"
+        body = "#{link_to truncate(h(target.proposal), 100), [project, target_repository, target]}"
+        category = "merge_request"
+      when Action::UPDATE_MERGE_REQUEST
+        source_repository = target.source_repository
+        project = source_repository.project
+        target_repository = target.target_repository
+        
+        action = "<strong>updated merge request</strong> from #{link_to h(project.title), project_path(project)}/#{link_to h(source_repository.name), project_repository_url(project, source_repository)}"
+        category = "merge_request"
+      when Action::DELETE_MERGE_REQUEST
+        project = target.project
+        
+        action = "<strong>deleted merge request</strong> from #{link_to h(project.slug), project_path(project)}/#{link_to h(target.name), project_repository_url(project, target)}"
+        category = "merge_request"
+    end
+      
+    [action, body, category]
+  end
+  
+  def sidebar_content?
+    !@content_for_sidebar.blank?
+  end
+  
+  def render_readme(repository)
+    possibilities = []
+    repository.git.git.ls_tree({:name_only => true}, "master").each do |line|
+      possibilities << line[0, line.length-1] if line =~ /README.*/
+    end
+    
+    return "" if possibilities.empty?
+    text = repository.git.git.show({}, "master:#{possibilities.first}")
+    markdown(text) rescue simple_format(sanitize(text))
+  end
+  
+  def file_path(repository, filename, head = "master")
+    project_repository_blob_path(repository.project, repository, head, filename)
+  end
 end

--- /dev/null
+++ b/app/helpers/events_helper.rb
@@ -0,0 +1,2 @@
+module EventsHelper
+end