Merge branch 'master' of git://github.com/bsag/tracks

app/controllers/application.rb

@@ -7,7 +7,13 @@ require "redcloth"
 
 require 'date'
 require 'time'
-Tag # We need this in development mode, or you get 'method missing' errors
+
+# Commented the following line because of #744. It prevented rake db:migrate to 
+# run because this tag went looking for the taggings table that did not exist
+# when you feshly create a new database
+# Old comment: We need this in development mode, or you get 'method missing' errors
+# 
+# Tag 
 
 class ApplicationController < ActionController::Base
 

app/views/feedlist/index.html.erb

@@ -54,6 +54,10 @@
 			<%= text_formatted_link({:controller => 'projects', :action => 'index', :only_active_with_no_next_actions => true}) %>
 			Active projects with no next actions
 		</li>
+		<li>
+                        <%= text_formatted_link({:controller => 'projects', :action => 'index', :projects_and_actions => true}) %>
+                        Active projects with their actions                   
+	        </li>
 		<li><h4>Feeds for incomplete actions in a specific context:</h4>
 			<ul>
 				<% for context in @contexts %>
@@ -84,4 +88,4 @@
 
 <div id="input_box">
   <%= render "sidebar/sidebar" %>
-</div><!-- End of input box -->
+</div><!-- End of input box -->

app/views/todos/_todo.html.erb

@@ -12,7 +12,7 @@
     <%= remote_toggle_checkbox unless source_view_is :deferred %>
     <div class="description<%= staleness_class( todo ) %>">
       <%= date_span -%>
-      <span class="todo.descr"><%= sanitize(todo.description) %></span>
+      <span class="todo.descr"><%= h sanitize(todo.description) %></span>
       <%= tag_list %>
       <%= deferred_due_date %>
       <%= project_and_context_links( parent_container_type, :suppress_context => suppress_context, :suppress_project => suppress_project ) %>