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

251 commits

Author SHA1 Message Date
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-01-07 21:01:55 +01:00
Reinier Balt
463f5e922d Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2013-09-22 10:30:24 +02:00
Reinier Balt
871e18922b refactor the cli examples in /doc and fix a small bug in todos_controller 2013-09-18 17:45:22 +02:00
Reinier Balt
bbf6cdf702 fix failing cucumber scenario's and update gems 2013-09-18 10:38:20 +02:00
Reinier Balt
9c86396ef0 Merge branch 'master' into new-gui 
Conflicts:
	app/views/projects/_project_settings.html.erb
	app/views/todos/_todo.html.erb
 2013-09-13 16:52:06 +02:00
Reinier Balt
eaa66be698 fix deprecation warnings 2013-09-13 16:44:59 +02:00
Reinier Balt
e2eb31cfcc Merge pull request #206 from mmozuras/refactor_unless_blanks_into_presents 
Refactor unless blanks into presents
 2013-09-13 06:08:16 -07:00
Reinier Balt
35d0afdfdf Merge pull request #205 from mmozuras/refactor_negative_blanks_into_presents 
Refactor negative blanks into presents
 2013-09-13 05:56:03 -07:00
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03:00
Mindaugas Mozūras
a97848f0ba Refactor negative blank? into present? 2013-09-13 15:19:25 +03:00
Mindaugas Mozūras
962b4fa5c9 Use respond_to { |format| format.any } to reduce duplication 2013-09-13 14:58:28 +03:00
Reinier Balt
37f8acb214 fix count in navbar and fix tickler 2013-08-24 22:11:52 +02:00
Reinier Balt
c0edd1749c use twitter/typeahead for autocomplete. make go to project|context|tag work and show 
project details in a popover
 2013-08-07 23:31:28 +02:00
Reinier Balt
7605ec404f move will_paginate on all_todos pages to will_paginate-bootstrap gem to get the bootstrap 
styling for free. Adds caching to todos/done page too
 2013-07-29 12:25:13 +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
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
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
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
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
ebd182695d remove the calendar from TodosController 2013-04-30 20:35:13 -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
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
Reinier Balt
67247980ad fix failing tests 2013-04-11 11:04:07 +02:00
Reinier Balt
9c0445fcb7 make adding of todos from sidebar work in context and project grouping 2013-04-11 10:53:35 +02:00
Reinier Balt
42566b6fee add test for collapsing project containers 2013-04-06 12:57:53 +02:00
Reinier Balt
85fc82d494 refactor done todos view and tests 2013-03-18 12:36:40 +01:00
Reinier Balt
ede898120c remove option to show empty containers and start fixing failing cucumber scenarios 2013-03-18 12:36:40 +01:00
Reinier Balt
22b371ef8c do a big refactor of rendering collections of todos for home page, tag page, project page, context page 2013-03-18 12:36:40 +01:00
Reinier Balt
f22dfc1f9b initial changes to add an option to select either context or project as grouping of todos on home or tag page 
* new menu item in view menu
* js to toggle view
* store setting in cookie to keep de choice of view persistent
* refactor index and tag page of todos to look more alike
* refactor context and project partials to look more alike
 2013-03-18 12:32:28 +01:00
Reinier Balt
1e84adc91b get tests running and fix editing context state 2013-03-01 16:22:29 +01:00
Reinier Balt
48e47fc009 remove dynamic finders from cucumber scenarios 2013-02-27 20:02:01 +01:00