From 8edcabf25e3758033fe499f44b2cf43246a861de Mon Sep 17 00:00:00 2001 From: lrbalt Date: Mon, 2 Jun 2008 08:21:03 +0000 Subject: [PATCH] prepares trunk for 1.6 release git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@862 a4c988fc-2ded-0310-b66e-134b36920a42 --- tracks/README_FIRST | 4 ++-- tracks/config/environment.rb.tmpl | 8 +------- tracks/doc/CHANGELOG | 12 +++++++++--- tracks/doc/README_DEVELOPERS | 8 ++++++-- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/tracks/README_FIRST b/tracks/README_FIRST index bbf1323f..dcc8f3ed 100644 --- a/tracks/README_FIRST +++ b/tracks/README_FIRST @@ -7,8 +7,8 @@ * Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss * Original developer: bsag (http://www.rousette.org.uk/) * Contributors: http://dev.rousette.org.uk/wiki/Tracks/Contributing/Contributors -* Version: 1.5 -* Copyright: (cc) 2004-2006 rousette.org.uk. +* Version: 1.6 +* Copyright: (cc) 2004-2008 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. diff --git a/tracks/config/environment.rb.tmpl b/tracks/config/environment.rb.tmpl index 745c83b7..e80b02db 100644 --- a/tracks/config/environment.rb.tmpl +++ b/tracks/config/environment.rb.tmpl @@ -98,10 +98,4 @@ end MOBILE_CONTENT_TYPE = 'tracks/mobile' Mime::Type.register(MOBILE_CONTENT_TYPE, :m) -tracks_version = '1.6-trunk' -info = `svn info #{RAILS_ROOT} --config-dir /etc/subversion`[/Last Changed Rev: (.*?)\n/] -if info - tracks_version += '-rev'+info[/(\d+)/] -end - -TRACKS_VERSION=tracks_version +TRACKS_VERSION='1.6' diff --git a/tracks/doc/CHANGELOG b/tracks/doc/CHANGELOG index 086543dc..ff31fb67 100644 --- a/tracks/doc/CHANGELOG +++ b/tracks/doc/CHANGELOG @@ -2,8 +2,8 @@ * Homepage: http://www.rousette.org.uk/projects/ * Author: bsag (http://www.rousette.org.uk/) -* Contributors: Nicholas Lee, Lolindrath, Jim Ray, Arnaud Limbourg, Timothy Martens, Luke Melia, John Leonard, Jim Strupp, Eric Lesh, Damien Cirotteau, Janet Riley, Reinier Balt, Jacqui Maher, James Kebinger -* Version: 1.5rc1 +* Contributors: Nicholas Lee, Lolindrath, Jim Ray, Arnaud Limbourg, Timothy Martens, Luke Melia, John Leonard, Jim Strupp, Eric Lesh, Damien Cirotteau, Janet Riley, Reinier Balt, Jacqui Maher, James Kebinger, Jeffrey Gipson +* Version: 1.6 * Copyright: (cc) 2004-2008 rousette.org.uk * License: GNU GPL @@ -13,7 +13,13 @@ Trac (for bug reports and feature requests): http://dev.rousette.org.uk/report/6 Wiki (deprecated - please use Trac): http://www.rousette.org.uk/projects/wiki/ -== Version 1.5rc1 +== Version 1.6 +1. upgrade to rails 2.0 +2. new mobile interface +3. new search functionality to search on todos, projects, contexts and notes +4. Bugfixes + +== Version 1.5 1. Show from date allows you to postpone the appearance of actions in the list until you can do something about them (like a 'tickler') 2. Tagging of actions 3. Simple management of users (deleting users through the web interface) diff --git a/tracks/doc/README_DEVELOPERS b/tracks/doc/README_DEVELOPERS index 2005ae3e..e8f9bde0 100644 --- a/tracks/doc/README_DEVELOPERS +++ b/tracks/doc/README_DEVELOPERS @@ -1,4 +1,8 @@ -1. SQLITE3 FOR TESTING +1. Wiki + +There are some pointers for setting up your Tracks copy for testing at http://dev.rousette.org.uk/wiki/Tracks/Testing + +2. SQLITE3 FOR TESTING By default, tests are configured to run using sqlite3 in memory mode to increase speed. You will need the sqlite3-ruby gem for this. @@ -8,7 +12,7 @@ To avoid showing the migrations as tests are run, add the following to your data If you want to run tests using another database, that's fine, too. Just change your database.yml accordingly. -2. SELENIUM TESTS +3. SELENIUM TESTS To run selenium tests, start Tracks in test mode using