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 00d8bc7f97Resolves #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
Reinier Balt
bd9b8c8f53
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-05 14:43:43 +01: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
cc1c629018
adds test for changing context on a todo in tag view. Resolves #762
2008-12-03 22:16:34 +01:00
Reinier Balt
dce58f41f8
Add testcase where changing the name of a project should be reflected in the default project name. resolves #756
2008-12-03 21:05:16 +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
e743dd79c3
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-03 14:07:33 +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
f3d7fac2a4
fix test where month+1 resulted in an error for december
2008-12-03 10:22:43 +01:00
Luke Melia
ba09aab89c
Restore custom user-extensions.js for selenium tests.
2008-12-02 23:27:35 -05:00
Reinier Balt
09f0322d45
fix a lot of selenium tests to pass again
2008-12-02 20:58:54 +01:00
Reinier Balt
df26cf6e87
Merge branch 'master' into railsupdate
2008-12-02 16:21:08 +01:00
Reinier Balt
6675682b60
Merge branch 'master' of git://github.com/bsag/tracks
2008-12-02 15:56:45 +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
Reinier Balt
9b504b3e47
Update selenium on rails using 'official' git repo
...
git://github.com/paytonrules/selenium-on-rails.git
2008-12-02 10:05:41 +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
