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

263 commits

Author SHA1 Message Date
Matt Rogers
258528460d Merge pull request #1873 from C-Otto/default-context-choice-2.3 
(2.3) in tag view, do not use more-or-less random context for the form
 2015-08-07 20:02:01 -04:00
Dan Rice
ebec4f089d Merge pull request #1875 from C-Otto/tracks-1836 
(2.3) Provide data needed for partial views
 2015-06-14 18:15:59 -04:00
Carsten Otto
4ce7c6bcd4 Provide data needed for partial views 
The partials for context and project need to compute the
context's/project's id, which is done based on @context/@project.
Provide this data.

Fixes #1836
 2015-05-22 23:02:41 +02:00
Carsten Otto
bba13194fd show dependency validation errors in action edit form 2015-05-22 20:51:27 +02:00
Carsten Otto
fd8f4e2b32 Fix syntax 2015-05-22 20:51:27 +02:00
Carsten Otto
82ac4e22b0 fix syntax 2015-05-14 15:51:49 +02:00
Carsten Otto
dd21e7466c in tag view, do not use more-or-less random context for the form 
See #1834 for a discussion
 2015-05-14 15:38:37 +02:00
Dan Rice
556c68c2e6 Revert breaking commits 
This reverts the following commits:
c129b8a06f
c7c923a317
006c135a64
 2015-04-14 22:26:07 -04:00
Carsten Otto
aa14a8e802 Sort by 'show_from' in tickler 2015-04-13 16:25:44 +02:00
Reinier Balt
006c135a64 do not compare at_midnight in different timezones. 
Use localtime to make sure both dates are in the
same timezone
 2015-04-13 15:33:22 +02:00
Carsten Otto
502543f348 typo 2015-04-13 14:38:37 +02:00
Carsten Otto
32b48df78f catch exception to show error message in GUI as before 2015-04-13 14:37:25 +02:00
Matt Rogers
aa41e20e46 Remove trailing whitespace and tabs 2014-08-14 21:05:05 -05:00
Reinier Balt
595806be87 add parameter to REST api for todos to limit result to active todos. Fixes #1388 2014-05-16 15:33:45 +02:00
Reinier Balt
3b673f0838 fix some failing cucumber tests 2014-01-09 11:18:33 +01:00
Reinier Balt
def136374c fix regression. Still need to add test to controller tests 2014-01-09 08:05:14 +01:00
Reinier Balt
5dabde222e dry previous commit even further 2014-01-07 20:49:37 +01:00
Reinier Balt
a23587370d remove some duplication in todos_controller 2014-01-07 20:42:19 +01: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
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
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