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

516 commits

Author SHA1 Message Date
Reinier Balt
d64f6e003e Merge branch 'master' into rails4 
Conflicts:
	Gemfile.lock
 2013-06-21 10:20:36 +02:00
Reinier Balt
64d3e802f2 fix #1406. fix #1431. set recurring_period first before setting other attributes 2013-06-19 16:42:35 +02:00
Reinier Balt
2daffef683 fix failing tests 2013-06-17 10:06:38 +02:00
Reinier Balt
4a485558e2 Merge branch 'master' into rails4 
Conflicts:
	Gemfile.lock
	config/routes.rb
 2013-06-17 09:25:02 +02:00
Reinier Balt
0a57a68a87 Project and context view can now be grouped by context and project (using view menu) 2013-06-11 11:12:21 +02:00
Reinier Balt
9c56416dcb Merge pull request #184 from mattr-/cucumber-login-backdoor 
Move the expire_session route
 2013-06-10 21:52:25 -07:00
Matt Rogers
931791edfd Move the expire_session route 
It's now in the cucumber login helper.
 2013-06-10 14:30:12 -05:00
Reinier Balt
02d4afb724 fix #1429 by correctly handling tags with dots 
This was a very old regression. This used to work before the rails 3.2 upgrade... Added tests
to prevent future unnoticed breakage
 2013-06-03 15:20:13 +02:00
Reinier Balt
671f64b419 move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
Reinier Balt
8ffacca393 fix cucumber scenario's. 
One still fails on Cookie overflow, but works testing by hand...
 2013-05-13 17:13:26 +02:00
Reinier Balt
08498fee4f fix failing tests 
Includes a monkey patch for Arel that may need to be removed when 4.0.0 final ships
 2013-05-13 15:35:21 +02:00
Reinier Balt
80974fb0d5 empty non-saved project caused rss builder to fail 2013-05-13 12:50:10 +02:00
Reinier Balt
ebff4cfc0c start fixing deprecation warnings 2013-05-11 23:13:32 +02:00
Reinier Balt
0d0b36de29 remove duplication in feedlist controller 2013-05-11 10:49:38 +02:00
Reinier Balt
cdfb65d529 remove duplication of all_done_todos and done_todos in project and context container 2013-05-11 10:38:34 +02:00
Reinier Balt
101268f504 Introduce #onsite_redirect_to helper for onsite redirects 
Prefer #onsite_redirect_to to #redirect_to when using untrusted input (e.g. cookies) in the redirect destination

Thanks @brynary
 2013-05-07 09:41:48 +02:00
Reinier Balt
78f81ed29f Do not symbolize arbitray locale params 
* Validate locale is valid before assigning it
* Don't convert invalid locales to symbols (creates DoS risk)

thanks @brynary
 2013-05-07 09:29:47 +02:00
Reinier Balt
0cc41bda87 Disable #yaml_import action for now 
This was dead code anyway

thanks @brynary
 2013-05-07 09:07:57 +02:00
Reinier Balt
ccdaae038b small refactorings 2013-05-05 20:32:32 +02:00
Reinier Balt
f891ee86fe fix clearing show_from fails 
caused by slightly different (better) workings of aasm
 2013-05-03 19:28:26 +02:00
Matt Rogers
883ea2b968 Move Project#create_from_todo to its own class 
The point of this is to keep as many things out of the ActiveRecord
objects as possible and use them as just a thin database abstraction
layer.
 2013-05-02 22:30:24 -05:00
Matt Rogers
55eb7b818c Revert "Use an attr_reader for attributes" 
This reverts commit 6376bd7ef6.
 2013-04-30 23:02:54 -05:00
Matt Rogers
49886b1bd3 Revert "Cache the project and context names" 
This reverts commit 610152b8dd.
 2013-04-30 23:01:46 -05:00
Matt Rogers
c1597a7751 Rename to_xml_params to todo_xml_params 2013-04-30 22:52:22 -05:00
Matt Rogers
8fe343cccc Push to_xml_params down to ApplicationController 2013-04-30 22:50:32 -05:00
Matt Rogers
98b188d1df Add tests for the ICS and XML views and fix them up 2013-04-30 20:38:10 -05:00
Matt Rogers
ebd182695d remove the calendar from TodosController 2013-04-30 20:35:13 -05:00
Matt Rogers
83273ac342 add the before filter configuration back 2013-04-30 20:19:27 -05:00
Matt Rogers
d1ff0daf6f Move the calendar to its own controller 2013-04-30 20:09:46 -05:00
Matt Rogers
610152b8dd Cache the project and context names 2013-04-29 21:01:30 -05:00
Matt Rogers
6376bd7ef6 Use an attr_reader for attributes 2013-04-29 21:01:30 -05:00
Matt Rogers
1c2de3fd5a Remove codejunk 
Extra whitespace, explicit returns, and an extra begin/end pair are all
gone.
 2013-04-29 21:01:21 -05:00
Reinier Balt
010d0e9ba0 refactor creating todos in todos_controller 2013-04-29 15:15:48 +02:00
Matt Rogers
8db5793bf6 Merge pull request #178 from TracksApp/rename-has-next-todo 
Rename RecurringTodo#has_next_todo
 2013-04-27 09:52:58 -07:00
Matt Rogers
6b8e745234 Use Todos::Calendar in the view 2013-04-26 23:23:56 -05:00
Matt Rogers
fb71441436 Start using Todos::Calendar in the calendar action 
Replaces the existing query logic in a lot of places
 2013-04-26 23:09:47 -05:00
Matt Rogers
88e7798db6 Rename RecurringTodo#has_next_todo to continues_recurring? 
This clarifies the intent of the method.
 2013-04-26 16:30:12 -05:00
Matt Rogers
1431bef1a9 Use first_or_create to creating missing Tags 2013-04-26 08:46:06 -05:00
Matt Rogers
3425b3fa10 Remove duplication when setting up done by tag views 2013-04-26 08:40:24 -05:00
Matt Rogers
6af7fe0ab6 Remove unused method 2013-04-26 08:31:00 -05:00
Matt Rogers
56f366b432 Remove context_specified_by_name from TodosController 
Use TodoCreateParamsHelper instead to remove the duplication
 2013-04-26 08:04:22 -05:00
Matt Rogers
d5dc723ef0 Remove project_specified_by_name from TodoController 
Use TodoCreateParamsHelper instead here and remove the duplication
 2013-04-26 08:02:47 -05:00
Matt Rogers
445a0c7602 Remove trailing whitespace 2013-04-26 07:55:06 -05:00
Matt Rogers
a60b4389cd Fix a bug when generating predecessor autocomplete data 2013-04-25 21:13:49 -05:00
Matt Rogers & Katrina Owen
a1b270699d Extract creation of todos from recurrings todos 2013-04-25 20:45:14 -05:00
Reinier Balt
0607096e7c add cucumber tests for tickler with group by project 2013-04-24 23:30:58 +02:00
Reinier Balt
a987ff3727 use size in stead of count to prevent unnecessary querying 2013-04-22 11:11:53 +02:00
Reinier Balt
caec4f214a enable group by project for tickler 2013-04-20 20:20:57 +02:00
Reinier Balt
9172d5e001 fix failing scenario 2013-04-17 23:26:46 +02:00
Reinier Balt
8641ecfc4e add some project grouping scenarios to edit_a_todo and fix failures 
also refactor step definitions
 2013-04-17 22:11:24 +02:00