Commit graph

154 commits

Author SHA1 Message Date
Carsten Otto
ed3bca22a4 Remove 'project_hidden' state
Compute it using project/context state

Notable change:
todo.hidden? now also returns true if the todo is completed
2016-04-16 09:27:33 +02:00
Jan-Yves Ruzicka
ccf13418f4 Extract rendering to helper method. Shift filename sanitization to controller. 2016-02-02 11:08:12 +00:00
Matt Rogers
3468d1ec13 Merge branch '2.3_branch' 2015-12-08 20:14:33 -06:00
Reinier Balt
ddd9c07d3b Fasterer: Use &:symbol is faster
Calling argumentless methods within blocks is slower than using
symbol to proc.
2015-08-19 14:48:31 +02:00
Carsten Otto
e0143cf435 move actual activation to model
fixes #1881
2015-08-09 13:47:17 +02:00
Reinier Balt
2bd68fecb7 Create attachment model and hook it up to todo
An attachment has write permissions on group so that managing
attachments work from different users in same group, i.e. user apache
and user mail.
2015-08-05 16:05:19 +02:00
Carsten Otto
6017637abc do not activate already completed todos, fix #1778 2015-04-13 14:37:57 +02:00
Carsten Otto
cec2e535b2 fix #1754 2015-04-13 14:37:12 +02:00
Reinier Balt
17c5edd7ae Merge pull request #1783 from C-Otto/bug-1778
do not activate already completed todos, fix #1778
2015-04-12 17:27:59 +02:00
Carsten Otto
0edc263c7e fix #1754 2015-03-24 11:27:36 +01:00
Carsten Otto
cfdafc69e3 do not activate already completed todos, fix #1778 2015-03-24 11:27:17 +01:00
Matteo Giaccone
13f8023ca0 Fix #1724 2015-01-01 18:16:40 -05:00
Matteo Giaccone
2ca90537ae Fix #1724 2014-12-19 21:17:35 +00:00
Matt Rogers
aa41e20e46 Remove trailing whitespace and tabs 2014-08-14 21:05:05 -05:00
Dan Rice
622291d98d Purge UserTime from app/* 2014-06-12 21:24:31 -04:00
Reinier Balt
0f5a11882e fix deleting dependencies 2014-05-16 16:14:50 +02:00
Reinier Balt
17dca39d3a update gems and fix i18n and aasm deprecation warnings 2013-12-30 20:52:35 +01:00
Reinier Balt
a31c0a7a5d fix import for csv 2013-09-16 11:37:16 +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
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
Reinier Balt
cb46a8461e fix show_from not being clear when a todo comes from tickler 2013-09-05 12:21:43 +02:00
Matt Rogers
6681df9530 Merge pull request #202 from TracksApp/extract-extras-from-user
Extract time and date concerns from User
2013-08-01 14:59:17 -07:00
Matt Rogers
8512e8db3b rename DateUtils to UserTime 2013-07-29 21:51:15 -05:00
Matt Rogers
a1aaa283f1 Remove User#at_midnight
Replace it with a class called DateUtils with a method called
`#midnight_for` that takes a preference instance and date to convert to
midnight.
2013-07-29 16:34:23 -05:00
Reinier Balt
4c4ce911fc Merge pull request #199 from shaded2/csv_import
Csv import
2013-07-26 03:04:07 -07:00
Darren Cato
2feb907204 made changes to MAX_DESCRIPTION_LENGTH everywhere 2013-07-23 01:52:47 -04:00
Darren Cato
2e13affdce typos and style tweaks 2013-07-23 01:28:43 -04:00
Matt Rogers
bcbfe42899 Merge pull request #195 from doncruse/master
Removing some intermediate values and shifting HTML formatting to a helper
2013-07-22 19:44:18 -07:00
Darren Cato
3450c22e97 first pass at csv import functionality for tracks 2013-07-21 13:37:35 -04:00
Don Cruse
9073fa1237 Removing some intermediate values
This removes some intermediate steps that were ultimately not necessary
to the math.  It also consolidates some of the methods for counting events
so that fewer intermediate values are necessary.

To that end, a new scope is added to the ToDo model for events that are
*either* created_at or completed_at after a certain date. This scope
allows the StatsController to pull out the largest possible responsive
set of values, and then filter just the particular slices that it needs
for various steps in the calculation.
2013-07-18 22:32:44 -05:00
Matt Bridges
c2111b2f8e Extract behavior from Todo.from_rich_message
`Todo.from_rich_message` was partially tested from the MessageGateway,
but it is mostly untested and does not belong in Todo due to it's unique
nature. Extract it entirely from `Todo` into it's own dedicated object
for unit testing.
2013-07-18 16:35:51 -05: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
a8af880647 fix #1417. We now handle unblocking a todo that is part of a hidden project or context 2013-06-04 10:07:02 +02:00
Reinier Balt
671f64b419 move to strong_parameters of rails4. 2013-05-27 12:44:31 +02:00
Reinier Balt
ebff4cfc0c start fixing deprecation warnings 2013-05-11 23:13:32 +02:00
Reinier Balt
89cdfbc606 fix failing tests on ruby 1.9.3
funny, this is the first one not failing on 2.0.0 but failing on 1.9.3. Thanks for Travis!
2013-05-04 13:44:45 +02:00
Reinier Balt
5cfa115cdc small refactorings
fix passing params in use of _collection
2013-05-03 21:54:03 +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
b1fb1dd326 Remove more duplication from Todos::Calendar. 2013-04-29 16:35:50 -05:00
Matt Rogers
fedfb55ff8 Remove extra whitespace 2013-04-29 15:24:32 -05:00
Reinier Balt
010d0e9ba0 refactor creating todos in todos_controller 2013-04-29 15:15:48 +02:00
Reinier Balt
5ed69fc1a2 update gems and fix failures from new aasm
I'm not sure the test failures caused by reload not working are caused by the new aasm, 
perhaps the thread isolation is causing that...
2013-04-29 11:53:32 +02:00
Reinier Balt
1e84adc91b get tests running and fix editing context state 2013-03-01 16:22:29 +01:00
Reinier Balt
ef91dd0c64 another set of dynamic finder migrations. All non-cucumber tests pass 2013-02-27 11:50:49 +01:00
Reinier Balt
6fa70db39e fix updating dependency trees when changin a name. Including invalidating cache when
necessary
2013-02-17 17:37:44 +01:00
Reinier Balt
5454ba385f fix styling of error messages 2012-12-16 15:20:43 +01:00
Reinier Balt
8a8dc47ab8 Try the cache_digests gem for Tracks
cache_digests will be part of Rails 4
2012-09-02 15:13:28 +02:00
Reinier Balt
dd83040ea0 fix #1305 and #1309. Only check on show_from in the past when you change the show_from. This will not prevent a save of the todo when another change is made and show_from has some old date 2012-08-26 17:33:51 +02:00
Reinier Balt
4e29bf69f7 fix failing tests and small refactorings 2012-07-18 11:42:26 +02:00