Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-25 11:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
1204 commits 32 branches 36 tags 32 MiB
Commit graph

242 commits

Author SHA1 Message Date
Reinier Balt
8cdae83014 fix case when there are no tags places on todos, the stats page would fail. Fixes #822. 
Thanks Walter for finding this one
 2009-01-15 22:13:22 +01:00
bsag
278c7310c1 Fixed a repeated regression which I accidentally re-committed. I should pay more attention to the commits... Fixes #740. Again. 2009-01-11 18:58:36 +00:00
bsag
99c3aecc04 Committed a fix by karmajunkie: "fixed a small bug wherein @contexts wasn’t getting set in ProjectController.show for use in the shared/_add_new_item partial." 2009-01-11 16:01:52 +00:00
bsag
3554dd8dd0 Tidied formatting in app/model/preference.rb 2009-01-11 15:48:57 +00:00
Vitalie Lazu
5ee939ac47 Fixed exception in preference model when todo xml api is used with show_from attribute 
Signed-off-by: bsag <butshesagirl@rousette.org.uk>
 2009-01-11 23:37:14 +08:00
Hans de Graaff
b95e02e726 Don't run double sanitation on a string. 
This messes up legitimate markup returned by sanitize, such as &lt; when
a description contains '<'.

Signed-off-by: bsag <butshesagirl@rousette.org.uk>
 2009-01-11 23:02:10 +08:00
Reinier Balt
6017c5d2ed missed one taggings.user_id 2009-01-08 14:25:06 +01:00
Reinier Balt
037c04e72f restore bugfix of Luke that I removed in last commit by mistake. 2009-01-08 10:45:19 +01:00
Reinier Balt
cebaf05a7f fix small error in last commit 2009-01-08 10:39:14 +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
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
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
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
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
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