Reinier Balt
efed98aa05
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-23 12:17:40 +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
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
Reinier Balt
affc78bec7
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-14 17:04:36 +01:00
Reinier Balt
c2a34e1dc5
Merge branch 'master' of git@github.com:bsag/tracks
2008-12-14 16:50:30 +01:00
Reinier Balt
a0be7eda2d
Merge branch 'fixesgraaff'
2008-12-14 16:49:25 +01:00
Reinier Balt
aa4eacc8d6
Merge git://github.com/graaff/tracks into fixesgraaff
2008-12-14 16:48:22 +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
bsag
297517d7b8
Updated the manual in HTML, PDF and .tex format.
2008-12-14 12:01:02 +00:00
bsag
498be90be6
Minor updates to the example db.
2008-12-14 11:43:34 +00:00
Hans de Graaff
27e0852651
Limit description field to known maximum size.
2008-12-14 11:17:07 +01:00
Reinier Balt
155065d819
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-12 15:39:22 +01:00
Reinier Balt
b96def669d
set version to 1.7RC
2008-12-11 16:59:48 +01:00
Reinier Balt
03d6f4aa07
update version in template
2008-12-11 16:50:14 +01:00
Reinier Balt
64a15e7089
update changelog
2008-12-11 08:42:27 +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
Reinier Balt
2aa949f22a
update the sample sqlite databases and update sample content sql. Solves #802
2008-12-10 09:42:35 +01:00
Reinier Balt
e6688703bb
forgot ot change one version to 1.7
2008-12-09 10:12:38 +01:00
Reinier Balt
0c57c9e661
Merge branch 'master' of git@github.com:bsag/tracks
2008-12-09 10:10:25 +01:00
Reinier Balt
b3bc85cedc
update documentation for 1.7rc release
2008-12-09 10:05:37 +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
cf4ea7c2cd
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-08 20:31:42 +01: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
Eric Allen
e92dae2ffc
Upgraded to open_id_authentication plugin at 00d8bc7f97 and unpacked ruby-openid gem version 2.1.2.
2008-12-08 00:44:09 -05:00
Reinier Balt
6149900e0c
remove old compressed js and css from the asset_packager plugin that we don't use anymore
2008-12-05 15:58:20 +01:00