Commit graph

176 commits

Author SHA1 Message Date
Reinier Balt
747c84ba7c Merge branch '1.7_branch' 2008-12-22 23:32:06 +01:00
Reinier Balt
0e68ded56a fix tags and fix tests 2008-12-22 23:26:38 +01:00
Reinier Balt
c618d35d3a first pass at restoring tag functionality 2008-12-22 20:55:32 +01:00
Reinier Balt
7399edc2d6 fix two ruby warnings 2008-12-22 17:02:23 +01:00
Reinier Balt
65d3536599 update tagging model 2008-12-22 16:53:26 +01:00
Reinier Balt
cf212fefce Merge branch '1.7_branch' 2008-12-22 16:43:22 +01:00
Reinier Balt
2d11109b8b make the mobile homepage pass the w3c validator 2008-12-22 16:41:43 +01:00
bsag
947792285d Merge branch 'mcveat/master'
* mcveat/master:
  Tried to fix highline gem error by updating gemspec. Didn't work ;-)
  Missing change in ContextController, that should be supplied with fix for Ticket #630 http://dev.rousette.org.uk/ticket/630
  Fix for Ticket #630 http://dev.rousette.org.uk/ticket/630
2008-12-18 16:46:25 +00:00
Reinier Balt
5dd7bb99f9 Merge branch '1.7_branch' 2008-12-18 10:18:03 +01:00
Reinier Balt
c5598a94ee fix small bug where a check was done on a wrong value 2008-12-18 10:17:16 +01:00
Piotr Adamski
0c5737e986 Missing change in ContextController, that should be supplied with fix for Ticket #630 http://dev.rousette.org.uk/ticket/630 2008-12-17 17:15:04 +01:00
Piotr Adamski
7bb953c45b Fix for Ticket #630 http://dev.rousette.org.uk/ticket/630 2008-12-16 11:42:34 +00:00
Piotr Adamski
cc1531e11b Merge branch 'master' of git://github.com/bsag/tracks 2008-12-15 21:00:25 +01:00
Piotr Adamski
d2c5775a69 Fix for Ticket #630 http://dev.rousette.org.uk/ticket/630 2008-12-15 20:48:50 +01:00
bsag
2ce81a75f0 Merge branch 'graaff/master'
* graaff/master:
  Limit description field to known maximum size.
2008-12-14 15:42:12 +00:00
bsag
b2c7e999ee Merge branch 'gorn/master'
* gorn/master:
  Refactoring changes to leave out unnecessary formatting.
  Merging.
  Changes in styleshet and generated html to conform more to mobile w3c reccomendations.
  Converting data to datetime to prevent the in_time_zone unknown function error on line 118.
2008-12-14 15:34:24 +00:00
bsag
4fb4a98bc8 Merge branch 'master' into clinton/master
* master: (40 commits)
  Updated the manual in HTML, PDF and .tex format.
  Minor updates to the example db.
  set version to 1.7RC
  update version in template
  update changelog
  OpenSearch support.
  update the sample sqlite databases and update sample content sql. Solves #802
  forgot ot change one version to 1.7
  update documentation for 1.7rc release
  No point in changing the name of the OpenID identity column in users table. Use the existing one.
  show recurrence pattern in :title of a recurring todo. Needed slight refactoring to make it happen
  Re-write OpenID code to use new authentication plugin. Tested to work!
  Upgraded to open_id_authentication plugin at 00d8bc7f97 and unpacked ruby-openid gem version 2.1.2.
  remove old compressed js and css from the asset_packager plugin that we don't use anymore
  applied the patches from Jakub to improve the mobile html
  adds test for changing context on a todo in tag view. Resolves #762
  Add testcase where changing the name of a project should be reflected in the default project name. resolves #756
  add testcase for deleting a user. Resolves #734
  implement suggestions for search in #787
  fix failing tests
  ...
2008-12-14 15:08:28 +00:00
Hans de Graaff
27e0852651 Limit description field to known maximum size. 2008-12-14 11:17:07 +01:00
Reinier Balt
c1d0e8d7cc Merge git://github.com/graaff/tracks into opensearch 2008-12-11 08:30:18 +01:00
Hans de Graaff
307e85287c OpenSearch support.
This implements #804.
2008-12-10 21:34:36 +01:00
Eric Allen
611a53e668 No point in changing the name of the OpenID identity column in users table. Use the existing one. 2008-12-08 18:51:33 -05:00
Reinier Balt
c46e5a9e1d show recurrence pattern in :title of a recurring todo. Needed slight refactoring to make it happen 2008-12-08 16:59:10 +01:00
Eric Allen
930999829b Re-write OpenID code to use new authentication plugin. Tested to work! 2008-12-08 00:52:57 -05:00
Reinier Balt
4dcb370389 applied the patches from Jakub to improve the mobile html
Thanks Jakub
2008-12-04 16:52:17 +01:00
Jakub Tesinsky
152e9d6c6e Refactoring changes to leave out unnecessary formatting. 2008-12-04 04:41:35 +01:00
Jakub Tesinsky
74d4fc41e1 Merge commit 'upstream/master' 2008-12-04 04:07:52 +01:00
Reinier Balt
539b4f96a1 add testcase for deleting a user. Resolves #734 2008-12-03 20:53:50 +01:00
Reinier Balt
3ddabd20d1 implement suggestions for search in #787
* the search form gets focus when loaded
* searching on contexts and tags added
2008-12-03 20:25:05 +01:00
Reinier Balt
2101ed6cf8 fix failing tests
selenium, unit and functional all pass
2008-12-03 14:03:59 +01:00
Reinier Balt
1432471fd5 refactor sidebar and fix error on editing projects 2008-12-03 12:59:34 +01:00
Reinier Balt
e143a03f73 restores sidebar and refactor sidebar
sidebar was not shown after rails upgrade
2008-12-03 12:31:24 +01:00
Jakub A.Tesinsky
eadeafbe24 Merging. 2008-12-03 12:03:23 +01:00
Jakub A.Tesinsky
3bc06d26e5 Merge branch 'master' of git://github.com/bsag/tracks
Conflicts:

	app/helpers/todos_helper.rb
	app/views/contexts/_mobile_context.rhtml
	app/views/todos/_mobile_todo.rhtml
	public/stylesheets/mobile.css
2008-12-03 11:59:09 +01:00
Jakub A.Tesinsky
96dc05e4f1 Changes in styleshet and generated html to conform more to mobile w3c reccomendations. 2008-12-03 11:50:20 +01:00
Reinier Balt
df26cf6e87 Merge branch 'master' into railsupdate 2008-12-02 16:21:08 +01:00
Jakub A.Tesinsky
f42025e5da Converting data to datetime to prevent the in_time_zone unknown function error on line 118. 2008-12-02 10:16:00 +01:00
Jakub A.Tesinsky
8aa573a73e Merge branch 'master' of git@github.com:gorn/tracks 2008-12-02 02:24:08 +01:00
Jakub A.Tesinsky
a0d2362953 Optimalized mobile pages - span for empty tags is not included, divs around tr were against html specification and caused some mobiles render the page incorrectly. 2008-12-02 02:22:36 +01:00
Reinier Balt
198f3240b8 fix several deprecation warnings
truncate wants explicit :length => number and :omission
calling a partial from a js requires to explicitly pass the variable i.e. :todo => @todo instead of rails doing it implicitly
2008-11-30 20:16:57 +01:00
Reinier Balt
6da4282558 Merge branch 'master' into railsupdate 2008-11-30 14:03:18 +01:00
Reinier Balt
2980de2d8d fix error in calendar feed 2008-11-30 13:56:41 +01:00
Luke Melia
35ae5fc431 Next step in upgrading Tracks to Rails 2.2. Some highlights:
* Ran rake rails:update
* Added old actionwebservice framework
* Updated RSpec and RSpec-Rails
* Removed asset_packager plugin (not compatible, Scott no longer maintaining), and replaced with bundle_fu. See the bundle_fu README for more info.
* Hacks to UJS and ARTS plugins, which are no longer supported. Probably should move off both UJS and RJS.
* Hack to flashobject_helper plugin (upgrade to Rails 2.2-compatible version if/when it comes out.)
* Hack to skinny-spec plugin, for Rails 2.2 compatibility. Should check for official release.
* Hacks to resource_feeder plugin, for Rails 2.2 compatibility. Should check for official release (not likely) or move off it.
* Addressed some deprecation warnings. More to come.
* My mobile mime type hackery is no longer necessary with new Rails features. Yay!
* Updated environment.rb.tmpl with changes

TODO:
* Restore view specs marked pending
* Fix failing integration tests.
* Try selenium tests.
* Investigate OpenID support.
* Address deprecation warnings.
* Consider moving parts of environment.rb to initializers
* Address annoying config.gem warning about highline gem
2008-11-30 00:34:15 -05:00
Reinier Balt
ee30571855 fix #793 where the feed title is given more information about the content
also fixes project feed where the link in the feed points to the context of the todo instead of the project
2008-11-29 20:32:39 +01:00
Reinier Balt
5659b8adbb fix #764 where unnecessary space is removed in the recurrence pattern
also fixes the case that a rec todo that has a start date but no end date is not showing the from xx-xx-xxxx on the page
2008-11-29 20:15:49 +01:00
Reinier Balt
9d246f70cd Fix #795.
Similar hack as f43447e33f
2008-11-29 15:55:16 +01:00
Reinier Balt
9147fb887c refactor conditional finds to use named_scopes
also use updated_at in calendar feed
2008-11-29 15:35:17 +01:00
Clinton Forbes
cb7a1182fa Got format correct, but the default date was wrong. Set it to today. 2008-11-29 08:55:51 +11:00
Clinton Forbes
58cf93e1ed Correctly format default 'Start from' date for new recurring items 2008-11-29 08:44:57 +11:00
Reinier Balt
4a78b9f97a fix case where deleting a completed todo which belongs to a recurring todo resulted in multiple todos belonging to the recurring pattern or no todo at all 2008-11-28 16:52:54 +01:00
Reinier Balt
4a98ee5669 several fixes to recurring todos and adds some named_scopes
fixes case where unmarking a complete todo which belongs to a recurring pattern results in two todos that both keep on recurring. With this fix a new todo will only be created when there are no active todos left belonging to that recurring pattern

fixes tests that failed because of previous commits

adds some named_scopes, inspired by http://railscasts.com/episodes/108
2008-11-28 16:39:50 +01:00