Reinier Balt
cebaf05a7f
fix small error in last commit
2009-01-08 10:39:14 +01:00
Reinier Balt
974381c3b4
Merge branch 'remove_user_from_taggings' into 1.7_branch
2009-01-08 10:23:40 +01:00
Reinier Balt
083895dc33
Merge branch 'master' into 1.7_branch
2009-01-08 10:19:34 +01:00
Reinier Balt
f79c28231b
remove unused and unneccesary user_id from taggings table.
...
this way we can stay closer to the defaults of has_many_polymorphs thus making upgrading easier
2009-01-08 10:18:03 +01:00
bsag
65fe971d32
Merge branch 'master' of git@github.com:bsag/tracks
...
* 'master' of git@github.com:bsag/tracks:
Fixed bug where adding tag to Todo via Ajax inline edit didn't reflect tag changes immediately.
Restore automatic focus of first todo form field after clicking edit icon to edit.
2009-01-07 16:48:33 +00:00
bsag
2593832460
Pushed minor changes to manual.
2009-01-07 11:37:43 +00:00
Reinier Balt
cd372afd10
Merge branch 'master' into 1.7_branch
2009-01-06 09:54:24 +01:00
Luke Melia
00eff7e877
Fixed bug where adding tag to Todo via Ajax inline edit didn't reflect tag changes immediately.
2009-01-06 01:00:06 -05:00
Luke Melia
c7d1881472
Restore automatic focus of first todo form field after clicking edit icon to edit.
2009-01-06 00:49:40 -05:00
bsag
3d6789ceb9
Merge branch 'master' into 1.7_branch
...
* master:
Corrected the information about setting up the doc/manual submodule.
Added an example of capistrano deployment recipes for deploying to a remote web host running Phusion Passenger (aka mod_rails), which is probably the easiest Rails deployment environment to configure.
Update footer links for new website location
Change mobile login form to post to proper URL for OpenID login. Resolves #810 .
Fix failing specs
Don't re-generate remember token if we already have one. This should allow you to stay logged in on two devices at the same time. Closes #812 .
2009-01-05 18:52:09 +00:00
bsag
cfe4a482e1
Corrected the information about setting up the doc/manual submodule.
2009-01-05 18:51:32 +00:00
Luke Melia
a1a8260f10
Added an example of capistrano deployment recipes for deploying to a remote web host running Phusion Passenger (aka mod_rails), which is probably the easiest Rails deployment environment to configure.
2009-01-04 17:14:03 -05:00
Eric Allen
3864c9e37a
Update footer links for new website location
2009-01-03 17:57:57 -05:00
Eric Allen
b86c7341ff
Change mobile login form to post to proper URL for OpenID login. Resolves #810 .
2009-01-02 02:22:06 -05:00
Eric Allen
2eb9151d2e
Fix failing specs
2009-01-02 01:54:56 -05:00
Eric Allen
594ed4ca63
Don't re-generate remember token if we already have one. This should allow you to stay logged in on two devices at the same time. Closes #812 .
2009-01-01 17:13:00 -05:00
bsag
c381b2a5ea
Merge branch 'master' into 1.7_branch
...
* master:
Added note about getting doc/manual submodule to README.
Pulled in the changes to the manual.
Included the tracks_manual repository as a git submodule within doc/manual.
2009-01-01 11:54:46 +00:00
bsag
7380307ad4
Added note about getting doc/manual submodule to README.
...
Fixes #811 . Thanks Farzad!
2009-01-01 11:53:22 +00:00
bsag
630501f46e
Pulled in the changes to the manual.
...
If you want to pull in the latest changes to the manual:
cd doc/manual
git pull
2008-12-30 19:15:16 +00:00
bsag
46fdfdf2c6
Included the tracks_manual repository as a git submodule within doc/manual.
...
The manual should update when the originating tracks_manual repository is updated.
2008-12-30 19:05:41 +00:00
bsag
ee2df4568d
Merge branch 'master' into 1.7_branch
...
* master:
Updated URLs in main documents with new domain.
2008-12-30 15:26:43 +00:00
bsag
425a0d25da
Updated URLs in main documents with new domain.
2008-12-30 15:25:01 +00:00
bsag
c42cfc6e9f
Merge branch 'master' into 1.7_branch
...
* master:
Added a fix for a failing functional test which concerned the javascript popup window to warn when a new context added in new action form.
Fixed webrat/core.rb to solve problem with Ubuntu, as documented here:
Corrected URL for testing documentation to Tracks community wiki.
2008-12-26 19:51:08 +00:00
bsag
198db7b0a5
Added a fix for a failing functional test which concerned the javascript popup window to warn when a new context added in new action form.
2008-12-26 19:47:13 +00:00
bsag
5c4d27e8cd
Fixed webrat/core.rb to solve problem with Ubuntu, as documented here:
...
http://webrat.lighthouseapp.com/projects/10503/tickets/12-error-requiring-files-on-ubuntu
Fixes #808 (it really does this time!)
2008-12-26 17:55:09 +00:00
bsag
b62cc03b78
Corrected URL for testing documentation to Tracks community wiki.
2008-12-26 15:58:33 +00:00
bsag
e54f296dfe
Merge branch 'master' into 1.7_branch
...
* master:
Changed Tracks version in environment.rb.tmpl to 1.7. Fixes #808 .
2008-12-26 15:32:05 +00:00
bsag
94cd8dc077
Changed Tracks version in environment.rb.tmpl to 1.7. Fixes #808 .
2008-12-26 14:15:37 +00:00
Reinier Balt
b5c7e07de7
Merge branch 'master' of git@github.com:lrbalt/tracks
2008-12-23 12:29:41 +01:00
Reinier Balt
efed98aa05
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-23 12:17:40 +01:00
Reinier Balt
1d0ed34cea
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-23 12:11:40 +01:00
Reinier Balt
1ac810d149
sorry, misspelled extensions
2008-12-23 11:48:57 +01:00
Reinier Balt
d5b35a0fed
sorry, misspelled extensions
2008-12-23 11:46:14 +01:00
Reinier Balt
747c84ba7c
Merge branch '1.7_branch'
2008-12-22 23:32:06 +01:00
Reinier Balt
3f3ee31bb0
update environment.rb.tmpl with last update of has_many_polymorphs for tagging
2008-12-22 23:30:18 +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
c0dbabf226
get latest has_many_polymorphs from git repo.
...
The repo got fixes we need that are not in the gem
2008-12-22 20:54:18 +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
f06f8a1275
add .specification to has_many_polymorphs
2008-12-22 16:53:25 +01:00
Reinier Balt
44e371b118
add has_many_polymorphs to config.gem in environment.rb.tmpl
2008-12-22 16:53:24 +01:00
Reinier Balt
f97ca2f6af
upgrade has_many_polymorphs
2008-12-22 16:53:23 +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
Reinier Balt
16f170c299
Merge branch '1.7_branch'
...
Conflicts:
vendor/gems/ruby-openid-2.1.2/.specification
2008-12-21 22:00:41 +01:00
Reinier Balt
0604cb187f
fix annoying warning about the spec for highline.
...
seems that rake gems:refresh_specs only works for gems in /vendor/gems that are mentioned in config.gem in environment.rb. Therefore I've updated environment.rb.tmpl.
2008-12-21 21:53:42 +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
bsag
36a80a6a24
Tried to fix highline gem error by updating gemspec. Didn't work ;-)
2008-12-18 16:45:41 +00:00
Reinier Balt
5dd7bb99f9
Merge branch '1.7_branch'
2008-12-18 10:18:03 +01:00
