update versioning for master

This commit is contained in:
Reinier Balt 2012-04-03 15:49:24 +02:00
parent 2aef2b5622
commit 90c80c4330
4 changed files with 41 additions and 57 deletions

20
README
View file

@ -1,26 +1,20 @@
# Tracks: a GTD(TM) web application, built with Ruby on Rails
**IMPORTANT: Tracks is moving to a GitHub Organization to make it easier to continue administering the project. Development will soon cease at bsag/tracks and move to TracksApp/tracks. If you are currently pulling from bsag/tracks, please pull from TracksApp instead.**
`git clone git://github.com/TracksApp/tracks.git`
**The new home for Tracks is https://github.com/TracksApp/tracks**
* Project homepage: http://getontracks.org/
* Manual: http://TracksApp.github.com/tracks/
* Source at GitHub: http://github.com/TracksApp/tracks/
* Assembla space (for bug reports and feature requests): http://www.assembla.com/spaces/tracks-tickets/tickets
* Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki
* Forum: http://getontracks.org/forums/
* Forum (read-only): http://getontracks.org/forums/
* Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
* Original developer: bsag (http://www.rousette.org.uk/)
* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
* Version: 2.1devel
* Copyright: (cc) 2004-2011 rousette.org.uk.
* Version: 2.2devel
* Copyright: (cc) 2004-2012 rousette.org.uk.
* License: GNU GPL
All the documentation for Tracks can be found within the /doc directory and at
http://bsag.github.com/tracks/
http://tracksapp.github.com/tracks/
The latter includes full instructions for both new installations and upgrades
from older installations of Tracks.
@ -37,12 +31,12 @@ you cannot find a solution to your problem.
The wiki has a lot of user contributed installation HOWTOs for various webhosts, specific OS's and more.
If you are thinking about contributing towards the development of Tracks,
please read /doc/README_DEVELOPERS for general information, or
/doc/tracks_api_wrapper.rb for information on Tracks' API. Also you can find
some information on development on the wiki.
please read /doc/README_DEVELOPERS for general information. Also you can find
some information on development, testing and contributing on the wiki.
While fully usable for everyday use, Tracks is still a work in progress. Make
sure that you take sensible precautions and back up all your data frequently,
taking particular care when you are upgrading.
Enjoy being productive!

View file

@ -110,7 +110,7 @@ end
# changed in development.rb to show under_construction bar
NOTIFY_BAR = "" unless defined?(NOTIFY_BAR)
tracks_version='2.1devel'
tracks_version='2.2devel'
# 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`

View file

@ -1,43 +1,56 @@
= Tracks: a GTD web application, built with Ruby on Rails
= Tracks: a GTD(TM) web application, built with Ruby on Rails
* Project homepage: http://getontracks.org/
* Manual: http://TracksApp.github.com/tracks/
* Source at GitHub: http://github.com/TracksApp/tracks/
* Assembla space (for bug reports and feature requests): http://www.assembla.com/spaces/tracks-tickets/tickets
* Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki
* Forum: http://getontracks.org/forums/
* Forum (read-only): http://getontracks.org/forums/
* Mailing list: http://lists.rousette.org.uk/mailman/listinfo/tracks-discuss
* Original developer: bsag (http://www.rousette.org.uk/)
* Contributors: https://github.com/TracksApp/tracks/wiki/Contributors
* Version: 2.1devel
* Copyright: (cc) 2004-2011 rousette.org.uk.
* Version: 2.1RC1
* Copyright: (cc) 2004-2012 rousette.org.uk.
* License: GNU GPL
== Version 2.1devel
== Version 2.1RC1
NOTE: To use this version you need to migrate your database. Not migrating will
NOTE 1: To use this version you need to migrate your database. Not migrating will
cause new actions not to appear!
This version of tracks has moved to a new place on GitHub. Also the wiki moved
NOTE 2: This version of tracks has moved to a new place on GitHub. Also the wiki moved
to GitHub, see the changed URLs above.
New and changed features:
1. Redesign of the completed todos: a new overview page. Also all context and
project pages have a link to their completed actions
2. New locales (es and fr) and updated locales (de, nl)
3. You can star an action right from the form to add a new action
4. Redesign of preferences page.
3. You can star an action right from the form for adding a new action
4. Redesign of preferences page
5. You can now mark an action complete from the tickler
6. Project names can now contain comma (',') in it name
7. There are two example ruby scripts in /doc to use the REST API to add a todo
7. Context view now shows hidden and pending actions
8. Mobile improvements by Tim Madden (we now require some javascript support on the mobile)
9. Two extra defer periods in the context menu of an action
10.There is a review page where you can see stalled or neglected projects.
There is a reviewed button on the project edit page.
11.You need to change your password: migrated to better BCrypt hash algoritm for storing passwords by Jan Stępień
New features (technical)
1. There are two example ruby scripts in /doc to use the REST API to add a todo
or a project template with todos from the command line
2. The tag page can now select actions from mulitple tags using AND and OR.
There is no gui for this.
Syntax is /todos/tag/tagA,tagB?and=tagC to select all todos with (tagA or tagB) AND tagC
Under the hood:
1. Upgraded rails to 2.3.12, jquery to 1.6.2 and jquery-ui to 1.8.14
1. Upgraded rails to 2.3.12, jquery to 1.7.1 and jquery-ui to 1.8.17
2. Fixed several issues with the REST API
3. Upgraded the act_as_statemachine plugin. This change requires a
migration. See note above!
4. Migated to bundler for gem dependencies
5. Migrated to cucumber and capybara for integration testing
6. Development mode shows a work-in-progress banner on top of the screen
See https://github.com/tracksapp/tracks/compare/v2.0...master for all
detailed changes

View file

@ -1,13 +1,13 @@
1. Resources
Tracks is using
* github to host the git repository.
* github to host the git repository and manage git pull requests.
* Assembla to manage bugs and enhancement request.
* the mailing list to discuss features and development and interact with users
See README for links to the respective sites
Also see the Development pages on the wiki for details on installing, upgrading, etc.
Also see the Development pages on the wiki for details on installing, testing, upgrading, etc.
2. Dependencies
@ -15,13 +15,11 @@ The dependencies for Tracks are maintained using bundler. Before starting your
tracks instance, you'll need to run 'bundle install' to fetch all the
dependencies
3. Wiki
3. Testing
There are some pointers for setting up your Tracks copy for testing at
https://github.com/TracksApp/tracks/wiki/Testing/
4. 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.
@ -33,33 +31,12 @@ database.yml below 'database: ":memory:"':
If you want to run tests using another database, that's fine, too. Just change
your database.yml accordingly.
5. Test::Unit tests
Running cucumber/selenium tests in :memory mode does not seem to work.
To run the Test::Unit tests run
rake test
Running the above command will run through the unit, functional, and
integration tests for Tracks. Use 'rake -T' to see a list of all rake tasks to
determine how to run each section of tests separately.
6. RSpec tests
To run the RSpec tests run
rake spec
7. Cucumber tests
To run the cucumber test run
rake cucumber
and for those using javascript/ajax use
rake cucumber:selenium
In order to run the selenium tests, you'll need to have Firefox 3.x installed.
Newer versions won't work.
The rspec tests are not actively maintained.
See the wiki for more information on testing: https://github.com/TracksApp/tracks/wiki/Testing
4. Contributing
See https://github.com/TracksApp/tracks/wiki/How-to-contribute