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

4262 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
6d11ebd1b0 Merge branch 'master' into railsupdate 2008-11-29 20:41:43 +01:00
Reinier Balt
ee30571855 fix #793 where the feed title is given more information about the content 
also fixes project feed where the link in the feed points to the context of the todo instead of the project
 2008-11-29 20:32:39 +01:00
Reinier Balt
5659b8adbb fix #764 where unnecessary space is removed in the recurrence pattern 
also fixes the case that a rec todo that has a start date but no end date is not showing the from xx-xx-xxxx on the page
 2008-11-29 20:15:49 +01:00
Reinier Balt
89f48f14fd Merge branch 'master' into railsupdate 2008-11-29 15:57:43 +01:00
Reinier Balt
9d246f70cd Fix #795. 
Similar hack as f43447e33f
 2008-11-29 15:55:16 +01:00
Reinier Balt
44fcef103a Merge branch 'master' into railsupdate 2008-11-29 15:37:29 +01: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
Clinton Forbes
cb7a1182fa Got format correct, but the default date was wrong. Set it to today. 2008-11-29 08:55:51 +11:00
Clinton Forbes
58cf93e1ed Correctly format default 'Start from' date for new recurring items 2008-11-29 08:44:57 +11:00
Reinier Balt
c838c9ba17 Merge branch 'master' of git://github.com/bsag/tracks 2008-11-28 17:05:24 +01:00
Reinier Balt
a20f625f9b Merge branch 'master' into railsupdate 2008-11-28 16:58:11 +01:00
Reinier Balt
4a78b9f97a fix case where deleting a completed todo which belongs to a recurring todo resulted in multiple todos belonging to the recurring pattern or no todo at all 2008-11-28 16:52:54 +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
ed91cdff86 install highline 1.5.0 2008-11-28 08:41:26 +01:00
Reinier Balt
f8057846bc remove highline gem 2008-11-28 08:40:13 +01:00
Reinier Balt
de9c2c0b77 install lastest had_many_polymorphs 
script/plugin install git://github.com/fauna/has_many_polymorphs.git
 2008-11-28 08:37:56 +01:00
Reinier Balt
56242fefa6 remove plugin had_many_polymorphs 2008-11-28 08:36:43 +01:00
Reinier Balt
59d5d4c8b6 freeze rails 2.2 2008-11-28 08:16:51 +01:00
Reinier Balt
fe5f962dcf unfreeze rails 2008-11-28 08:16:04 +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
f43447e33f added workaround for strange timezone behaviour 2008-11-27 15:48:20 +01:00
Reinier Balt
764e41685b fix migration to fill the updated_at column. The rss feeds need a filled column. Fixes #794 2008-11-26 10:53:00 +01:00
Reinier Balt
49f9f33ac0 add updated_at column to todos table 
This timestamp was missing. All other tables with timestamps have update_at. Could use this in statistics
 2008-11-21 13:36:10 +01:00
Reinier Balt
009b83abe6 whitespace 2008-11-14 11:49:37 +01:00
Reinier Balt
dd56c86f78 Merge branch 'master' of git://github.com/bsag/tracks 
Signed-off-by: Reinier Balt <lrbalt@gmail.com>
 2008-11-14 11:48:54 +01:00
Reinier Balt
f40c35276f fix the sort order for tag view. It is now the same as on the home page 2008-11-14 11:40:10 +01:00
Reinier Balt
33eba10e88 fix small timezone issue (#786) with the date that is shown for a todo 2008-11-11 15:24:16 +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
f21908a2a0 Fixes corner case where checking a monthly recurring todo complete on 
the same day the todo comes from tickler, a new todo is created and not
put in the tickler for next month, but for today
 2008-10-29 16:40:45 +01:00
Reinier Balt
e31b05a697 update query for Postgresql 
exchanging double quote with single quote in sql. Thanks Walter
 2008-10-28 22:39:50 +01:00
Reinier Balt
841eb1cb76 update changelog 2008-10-28 21:09:54 +01:00
Reinier Balt
2f510e8a86 Remove old compressed js and css that I forgot to commit last time 2008-10-28 21:03:05 +01:00
Reinier Balt
c6f89aed85 update compressed js and css because of last merge 2008-10-28 21:00:30 +01:00