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

README

@@ -8,8 +8,8 @@
 * Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
 * Original developer: bsag (http://www.rousette.org.uk/)
 * Contributors: http://getontracks.org/wiki/Tracks/Contributing/Contributors
-* Version: 1.7RC2
-* Copyright: (cc) 2004-2008 rousette.org.uk.
+* Version: 1.7
+* Copyright: (cc) 2004-2009 rousette.org.uk.
 * License:  GNU GPL
 
 All the documentation for Tracks can be found within the /doc directory. It contains a manual in HTML (manual.html) or PDF format (manual.pdf), and this includes full instructions for both new installations and upgrades from older installations of Tracks. The instructions might appear long and intimidatingly complex, but that is mostly because of the number of different platforms supported, and the different configurations which can be used (e.g. running Tracks on your local computer or on a remote server). If you choose the appropriate section for your situation (installation vs. upgrade), and use the easiest (recommended) method, you should find the instructions easy to follow. If you encounter problems, try searching the wiki, forum or mailing list (URLs above), and ask a question if you cannot find a solution to your problem.

app/controllers/todos_controller.rb

@@ -817,7 +817,7 @@ class TodosController < ApplicationController
           # for tomorrow.
           date = date_to_check.at_midnight >= Time.zone.now.at_midnight ? date_to_check : Time.zone.now-1.day
 
-          new_recurring_todo = create_todo_from_recurring_todo(recurring_todo, date)
+          new_recurring_todo = create_todo_from_recurring_todo(recurring_todo, date.at_midnight)
         end
       end
     end

app/views/data/index.html.erb

@@ -1,14 +1,7 @@
 <div id="display_box">
   <div id="feeds">
     <div id="feedlegend">
-      <h3>Importing data</h3>
-      <p>Curently there is a experimental support for importing YAML files. 
-        Beware: all your current data will be destroyed before importing the YAML 
-        file, so if you have access to the database, we strongly recomment backing up 
-        the database right now in case that anything goes wrong.
-      </p>
-      <p><%= link_to "Start import", :controller => 'data', :action => 'yaml_form' %>.</p>
-      <br/><br/><h3>Exporting data</h3>
+      <h3>Exporting data</h3>
       <p>You can choose between the following formats:</p>
       <ul>
         <li><strong>YAML: </strong>Best for exporting data. <br/><i>Please note that  importing YAML files is currently supported only in experimentally. Do not rely on it for backing up critical data.</i></li>

config/environment.rb

@@ -89,4 +89,10 @@ if ( SITE_CONFIG['authentication_schemes'].include? 'open_id')
   #requires ruby-openid gem to be installed
 end
 
-TRACKS_VERSION='1.7RC2'
+tracks_version='1.8devel'
+# comment out next two lines if you do not want (or can not) the date of the
+# last git commit in the footer
+info=`git log --pretty=format:"%ai" -1`
+tracks_version=tracks_version + ' ('+info+')'
+
+TRACKS_VERSION=tracks_version

doc/CHANGELOG

@@ -8,21 +8,20 @@
 * Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
 * Original developer: bsag (http://www.rousette.org.uk/)
 * Contributors: http://getontracks.org/wiki/Tracks/Contributing/Contributors
-* Version: 1.7RC2
-* Copyright: (cc) 2004-2008 rousette.org.uk.
+* Version: 1.7
+* Copyright: (cc) 2004-2009 rousette.org.uk.
 * License:  GNU GPL
 
-== Version 1.7RC2
+== Version 1.7
 
 New features:
 1. Recurring todos
 2. Cleanup of feed page and add feed for starred actions
-3. Initial importer of yaml files (still very EXPERIMENTAL)
-4. New interface to import an email / sms messages into Tracks (needs an email server on the same server as Tracks)
-5. New buttons to quickly defer an action 1 or 7 days
-6. Calendar view to review due actions, includes iCal feed to use in your calendar app (tested with Google Calendar, Evolution, Outlook 2007) 
-7. You can now sort projects on number of active todos
-8. Support for OpenSearch. This means you can add a Tracks as a search provider in your webbrowser (tested on FF3 and IE7)
+3. New interface to import an email / sms messages into Tracks (needs an email server on the same server as Tracks)
+4. New buttons to quickly defer an action 1 or 7 days
+5. Calendar view to review due actions, includes iCal feed to use in your calendar app (tested with Google Calendar, Evolution, Outlook 2007)
+6. You can now sort projects on number of active todos
+7. Support for OpenSearch. This means you can add a Tracks as a search provider in your webbrowser (tested on FF3 and IE7)
 
 Under the hood:
 1. We now allow users again to stay logged in on two devices at the same time

doc/manual

@@ -1 +1 @@
-Subproject commit b2fcae5326ff89f2ab5a5a8e5d55b41fd2787e51
+Subproject commit 8cb3847448223c5f0397a98e92a93a6af656e69d

spec/models/user_spec.rb

@@ -57,7 +57,7 @@ describe User do
     it 'has many completed todos' do
       User.should have_many(:completed_todos).
         with_order('todos.completed_at DESC').
-        with_conditions('todos.state = ? and todos.completed_at is not null', 'completed').
+        with_conditions('todos.state = ? AND NOT(todos.completed_at IS NULL)', 'completed').
         with_include(:project, :context).
         with_class_name('Todo')
     end

test/functional/todos_controller_test.rb

@@ -470,7 +470,11 @@ class TodosControllerTest < Test::Rails::TestCase
 
     # check that the new_todo is in the tickler to show next month
     assert !new_todo.show_from.nil?
-    assert_equal Time.utc(today.year, today.month, today.day)+1.month, new_todo.show_from
+
+    # use Time.zone.local and not today+1.month because the latter messes up
+    # the timezone. 
+    next_month = Time.zone.local(today.year, today.month+1, today.day)
+    assert_equal next_month.to_s(:db), new_todo.show_from.to_s(:db)
   end
 
   def test_check_for_next_todo