Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-15 19:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
1178 commits 30 branches 36 tags 33 MiB
Commit graph

66 commits

Author SHA1 Message Date
Hans de Graaff
414d1ca0bc Merge branch 'master' of git@github.com:graaff/tracks 2009-03-29 09:57:08 +02:00
Reinier Balt
a4de0e62af fix #860. The calendar view does not have a form in the right column for a new todo. The js for updating todos expects this form to update the autocompleter in case a new project or context is created with the update of the todo 
fixed with a hack
 2009-03-24 22:25:50 +01:00
Reinier Balt
1dca4747f3 fix suppressing some edit actions on certain views that were enables incorrectly 2009-03-24 21:06:53 +01:00
Reinier Balt
fbc55b73b9 fix js error in ie 2009-03-24 16:48:21 +01:00
Reinier Balt
dfffbc78c3 further enhance the context menu and fix showing of context menu on ie 2009-03-24 16:14:35 +01:00
Reinier Balt
3a8ce12fe8 further integrate contact menu and add visual feedback of ajax actions 2009-03-24 16:14:33 +01:00
Reinier Balt
06c4ea8a8c first pass at adding context menu for todos 2009-03-24 16:14:31 +01:00
Vitalie Lazu
496741c972 Fixed sidebar rendering, was not working on some pages after rails 2.2 upgrade 
Signed-off-by: Reinier Balt <lrbalt@gmail.com>
 2009-01-17 15:17:16 +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
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
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
Hans de Graaff
40f1732234 Don't run double sanitation on a string. 
This messes up legitimate markup returned by sanitize, such as &lt; when
a description contains '<'.
 2009-01-02 13:54:33 +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
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
Hans de Graaff
27e0852651 Limit description field to known maximum size. 2008-12-14 11:17:07 +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
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
2101ed6cf8 fix failing tests 
selenium, unit and functional all pass
 2008-12-03 14:03:59 +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
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
9147fb887c refactor conditional finds to use named_scopes 
also use updated_at in calendar feed
 2008-11-29 15:35:17 +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
Reinier Balt
bd2b410c7b change titles on calendar page to show the name of the month instead of This Month and Next Month 2008-11-27 16:45:47 +01:00
Reinier Balt
793f43ef07 fix #789 by setting tab order for all elements in mobile edit form 
I do not have an iPhone to test so I cannot check the report. Please report if the fix is wrong
 2008-11-09 11:15:49 +01:00
Reinier Balt
ddfc0e5e90 fix for actions that are due today were marked overdue in the ical calendar feed 2008-10-07 09:11:29 +02:00
Reinier Balt
f5c50d367e move overdue actions to today in the ics calendar and mark them as overdue 
as suggested by Hans de Graaff on the mailing list
 2008-10-06 17:13:38 +02:00
Reinier Balt
4c89133561 Merge branch 'calendar' 2008-10-04 15:59:40 +02:00
Reinier Balt
5d30512e97 add message when there are no actions in a container and handle state changes 2008-10-04 15:56:22 +02:00
Reinier Balt
541d6f5b69 add calendar to menu and implement ical 
tested ical with outlook 2007
 2008-10-03 22:44:58 +02:00
Eric Allen
05f21ebba2 Spec and fix bug #776 by using auto_link instead of my dumb regex 2008-10-03 10:19:41 -04:00
Reinier Balt
fcaea3ce20 first pass at adding calendar view 2008-10-03 14:16:43 +02:00
Eric Allen
397029dfc1 Add Selenium test for bug #776 and bug #775 and resolve both. Also fixed an unreported issue where deferring a todo by editing its show_from wouldn't hide an empty context. 2008-10-02 21:15:05 -04:00
Eric Allen
1b179e10c6 Only show defer buttons for uncompleted todos. 2008-09-07 06:58:08 -07:00
Eric Allen
ab28b22cbf Much prettier defer buttons and sane CSS that doesn't have issues with note divs. 2008-09-07 06:55:17 -07:00
epall
539fda21dc Preliminary defer buttons 2008-09-06 18:25:24 -07:00
Reinier Balt
11f9114ad5 polish the clear date buttons in edit form 
* placed them besides the text field
* replaces red x with grey x. the red x draws to much attention. also adds tool tip to x
 2008-08-26 17:31:34 +02:00
Reinier Balt
4d11e156f4 fix moving todos from one context to another on tag view 
also fix ordening on the collections on the tag view page
 2008-08-26 16:07:35 +02:00