Commit graph

329 commits

Author SHA1 Message Date
Reinier Balt
17dca39d3a update gems and fix i18n and aasm deprecation warnings 2013-12-30 20:52:35 +01:00
Greg Sutcliffe
2f043911c6 Extend RichMessage format to include other data
Uses new Regex to detect:

 @ context
 ~ project
 > tickler-date
 < due-date
 # tag (repeatable)
 * (starred)
2013-10-16 21:25:47 +01:00
Reinier Balt
9f55a45ec6 refactor search controller 2013-09-25 15:38:51 +02:00
Reinier Balt
067db90d58 various small refactorings 2013-09-22 17:34:58 +02:00
Greg Sutcliffe
8a2da01d51 Add Mailgun endpoint for receiving email tasks via Mailgun 2013-09-21 12:43:22 +01:00
Reinier Balt
62bc47b26b fix regression in recurring todos 2013-09-17 15:40:20 +02:00
Reinier Balt
a31c0a7a5d fix import for csv 2013-09-16 11:37:16 +02:00
Reinier Balt
94114746e7 Merge pull request #209 from iangreenleaf/monthly_recurring_bug
Fix endlessly repeating monthly recurring todos
2013-09-15 00:48:40 -07:00
Ian Young
a6c32889ce Bug repeating monthly recurring todos 2013-09-14 18:12:56 -07:00
Ian Young
aff7069c0e Fix bug assigning value from every_x_day input 2013-09-13 23:15:11 -07: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
fee1e3b504 fix failing test on timezones and remove debug message 2013-09-05 12:23:26 +02: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
96777c2e3a Replace User#time with UserTime#time 2013-07-30 16:21:04 -05:00
Matt Rogers
8512e8db3b rename DateUtils to UserTime 2013-07-29 21:51:15 -05:00
Matt Rogers
6c695aa61a Fix a date-based issue in the project tests
Due to time zone issues, this test was failing for me because it was
attempting to compare a date in my local time zone with a UTC date.
2013-07-29 21:43:05 -05:00
Matt Rogers
07a983ca1c clean up whitespace 2013-07-29 16:36:52 -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
Reinier Balt
28e3f377a8 fix failing validation on creating recurring todos 2013-07-20 14:40:50 +02: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 Rogers
c28ffd6763 Merge pull request #193 from mattdbridges/extract-rich-message
Extract behavior from Todo.from_rich_message
2013-07-18 20:12:03 -07:00
Matt Bridges
519e3df4d4 TodoFromRichMessage is really a service object 2013-07-18 16:41:28 -05:00
Colin Rymer
0a5936fecf use a null object like a boss 2013-07-18 16:37:34 -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
Colin Rymer
55e2f5b6a1 remove returns and clean up some conditionals 2013-07-18 16:03:18 -05:00
Colin Rymer
c71dc9afc9 remove boolean returning ternary expression 2013-07-18 15:22:46 -05:00
Colin Rymer
c5968b798c better leverage Hash#each for metaprogramming 2013-07-18 15:13:30 -05:00
Colin Rymer
332589163c metaprogramming and stylistic changes
- Use `define_method` to clean up definition of methods that only
   vary by the name of the day they reference and the corresponding
   numerical value.

 - Remove calls to self, explicit return statements, etc.
2013-07-18 15:01:02 -05:00
Colin Rymer
45df84b739 consolidate validates_presence_of validations 2013-07-18 14:10:14 -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
56b884055f fix #1270. if start-from fits the recurrence pattern, the first todo should use the start-from date
this is use-case 2 mentioned in the ticket.
2013-06-11 23:38:30 +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
54b106d96b remove use of .all on model 2013-05-13 12:33:01 +02:00
Reinier Balt
1234abb266 taggable_type should be accessible for test 2013-05-13 12:32:41 +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
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
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