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

2482 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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