--- a/AUTHORS
+++ b/AUTHORS
@@ -11,13 +11,15 @@ and he remains the project lead.
 Contributors
 -------------
 
-A number of people have contributed directly to Gitorious by writing documentation 
-or developing code and/or graphics. A list of these people in alphabetical order is included 
-below:
+A number of people have contributed directly to Gitorious by writing documentation
+or developing code and/or graphics that the project wishes to thank.
+A list of these people in order of appearance:
 
   * David A. Cuadrado <krawek@gmail.com>
   * August Lilleaas <augustlilleaas@gmail.com>
 	* Simon Bohlin <simon.bohlin@zondera.com>
 	* Tim Dysinger <tim@dysinger.net>
-	* Will <will@gina.alaska. edu>
-	
\ No newline at end of file
+	* Dag Odenhall <dag.odenhall@gmail.com>
+	* Will Fisher <will@gina.alaska.edu>
+  * Jonas Fonseca <fonseca@diku.dk>
+

--- a/TODO.txt
+++ b/TODO.txt
@@ -1,8 +1,22 @@
+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.
+
+new-ui:
+* 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:
+1) show commits actually merged for merge request after actual merge (I see them on open request, but do not on merged one)
+2) provide clone url on every repo browsing page, so I can get url to pull from even if I am reading a commit
+
+* 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
@@ -11,7 +25,6 @@
 >  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
@@ -27,7 +40,6 @@
 * 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/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -1,13 +1,13 @@
 class AccountsController < ApplicationController
   before_filter :login_required
-  
+
   def show
   end
-  
-  def edit  
-    @user = current_user  
+
+  def edit
+    @user = current_user
   end
-  
+
   def update
     @user = current_user
     @user.attributes = params[:user]
@@ -18,11 +18,11 @@ class AccountsController < ApplicationController
       render :action => "edit"
     end
   end
-  
+
   def password
     @user = current_user
   end
-  
+
   def update_password
     @user = current_user
     if User.authenticate(current_user.email, params[:user][:current_password])

--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -5,16 +5,16 @@ class ApplicationController < ActionController::Base
   session :session_key => '_ks1_session_id', :secret => GitoriousConfig["cookie_secret"]
   include AuthenticatedSystem
   include ExceptionNotifiable
-  
+
   rescue_from ActiveRecord::RecordNotFound, :with => :render_not_found
   rescue_from ActionController::UnknownController, :with => :render_not_found
   rescue_from ActionController::UnknownAction, :with => :render_not_found
-  
+
   def rescue_action(exception)
     return super if RAILS_ENV != "production"
-    
+
     case exception
-      # Can't catch RoutingError with rescue_from it seems, 
+      # Can't catch RoutingError with rescue_from it seems,
       # so do it the old-fashioned way
     when ActionController::RoutingError
       render_not_found
@@ -22,32 +22,32 @@ class ApplicationController < ActionController::Base
       super
     end
   end
-  
+
   protected
     def require_user_has_ssh_keys
       unless current_user.ssh_keys.count > 0
         flash[:error] = "You need to upload your public key first"
         redirect_to new_account_key_path
-        return 
+        return
       end
     end
-    
+
     def find_project
       @project = Project.find_by_slug!(params[:project_id])
     end
-    
+
     def find_project_and_repository
       @project = Project.find_by_slug!(params[:project_id])
       @repository = @project.repositories.find_by_name!(params[:repository_id])
     end
-    
+
     def check_repository_for_commits
       unless @repository.has_commits?
         flash[:notice] = "The repository doesn't have any commits yet"
         redirect_to project_repository_path(@project, @repository) and return
       end
     end
-    
+
     def render_not_found
       render :file => "#{RAILS_ROOT}/public/404.html", :status => 404
     end

--- a/app/controllers/blobs_controller.rb
+++ b/app/controllers/blobs_controller.rb
@@ -1,7 +1,7 @@
 class BlobsController < ApplicationController
   before_filter :find_project_and_repository
   before_filter :check_repository_for_commits
-  
+
 
   def show
     @git = @repository.git
@@ -32,7 +32,7 @@ class BlobsController < ApplicationController
     end
     render :text => @blob.data, :content_type => @blob.mime_type
   end
-  
+
   # def text
   # end
 end

--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -2,7 +2,7 @@ class CommentsController < ApplicationController
   before_filter :login_required, :only => [:new, :create, :edit, :update, :destroy]
   before_filter :find_project
   before_filter :find_repository
-  
+
   def index
     @comments = @repository.comments.find(:all, :include => :user)
     @merge_request_count = @repository.merge_requests.count_open
@@ -12,23 +12,24 @@ class CommentsController < ApplicationController
       format.atom { }
     end
   end
-  
+
   def commit
     @git = @repository.git
     @commit = @git.commit(params[:sha])
     @comments = @repository.comments.find_all_by_sha1(params[:sha], :include => :user)
   end
-  
+
   def new
     @comment = @repository.comments.new
   end
-  
+
   def create
     @comment = @repository.comments.new(params[:comment])
     @comment.user = current_user
     @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)
@@ -38,7 +39,7 @@ class CommentsController < ApplicationController
       end
     end
   end
-  
+
   protected
     def find_repository
       @repository = @project.repositories.find_by_name!(params[:repository_id])

--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -1,7 +1,7 @@
 class CommitsController < ApplicationController
   before_filter :find_project_and_repository
   before_filter :check_repository_for_commits
-  
+
   def index
     redirect_to project_repository_log_path(@project, @repository, @repository.head_candidate.name)
   end
@@ -17,5 +17,5 @@ class CommitsController < ApplicationController
       # TODO: format.diff { render :content_type => "text/plain" }
     end
   end
-  
+
 end

--- a/app/controllers/committers_controller.rb
+++ b/app/controllers/committers_controller.rb
@@ -1,13 +1,13 @@
 class CommittersController < ApplicationController
   before_filter :login_required, :only => [:new, :create, :destroy, :list]
   before_filter :find_project
-  before_filter :find_repository, 
+  before_filter :find_repository,
     :only => [:show, :new, :create, :edit, :update, :destroy, :list]
-    
+
   def new
     @committer = User.new
   end
-  
+
   def create
     @committer = User.find_by_login(params[:user][:login])
     unless @committer
@@ -21,8 +21,10 @@ 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 
+        format.xml do
           render :xml => @committer
         end
       else
@@ -32,12 +34,13 @@ class CommittersController < ApplicationController
       end
     end
   end
-  
+
   def destroy
     @committership = @repository.committerships.find_by_user_id(params[:id])
-    
+
     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 }
@@ -45,26 +48,26 @@ class CommittersController < ApplicationController
         flash[:error] = "Could not remove user from repository"
         format.html { redirect_to [@repository.project, @repository] }
         format.xml  { render :nothing, :status => :unprocessable_entity }
-      end    
-      
+      end
+
     end
   end
-  
+
   def list
     @committers = @repository.committers
     respond_to do |format|
       format.xml { render :xml => @committers }
     end
   end
-  
+
   def auto_complete_for_user_login
     login = params[:user][:login]
-    @users = User.find(:all, 
+    @users = User.find(:all,
       :conditions => [ 'LOWER(login) LIKE ?', '%' + login.downcase + '%' ],
       :limit => 10)
     render :layout => false
   end
-  
+
   private
     def find_repository
       @repository = @project.repositories.find_by_name!(params[:repository_id])

--- /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/keys_controller.rb
+++ b/app/controllers/keys_controller.rb
@@ -1,6 +1,6 @@
 class KeysController < ApplicationController
   before_filter :login_required
-  
+
   def index
     @ssh_keys = current_user.ssh_keys
     respond_to do |format|
@@ -8,7 +8,7 @@ class KeysController < ApplicationController
       format.xml { render :xml => @ssh_keys }
     end
   end
-  
+
   def new
     @ssh_key = current_user.ssh_keys.new
   end
@@ -24,7 +24,7 @@ class KeysController < ApplicationController
   def create
     @ssh_key = current_user.ssh_keys.new
     @ssh_key.key = params[:ssh_key][:key]
-    
+
     respond_to do |format|
       if @ssh_key.save
         flash[:notice] = "Key added"
@@ -36,22 +36,22 @@ class KeysController < ApplicationController
       end
     end
   end
-  
+
   def show
     @ssh_key = current_user.ssh_keys.find(params[:id])
-    
+
     respond_to do |format|
       format.html
       format.xml { render :xml => @ssh_key }
     end
   end
 
-  # can't update keys since yet we'd have to to search/replace through 
+  # can't update keys since yet we'd have to to search/replace through
   # authorized_keys
   # def edit
   #   @ssh_key = current_user.ssh_keys.find(params[:id])
   # end
-  # 
+  #
   # def update
   #   @ssh_key = current_user.ssh_keys.find(params[:id])
   #   @ssh_key.key = params[:ssh_key][:key]
@@ -62,12 +62,12 @@ class KeysController < ApplicationController
   #     render :action => "new"
   #   end
   # end
-  
+
   def destroy
     @ssh_key = current_user.ssh_keys.find(params[:id])
     if @ssh_key.destroy
       flash[:notice] = "Key removed"
     end
-    redirect_to account_path    
+    redirect_to account_path
   end
 end