Ian Young
a6c32889ce
Bug repeating monthly recurring todos
2013-09-14 18:12:56 -07:00
Reinier Balt
eaa66be698
fix deprecation warnings
2013-09-13 16:44:59 +02:00
Matt Rogers
b343d0a09e
Merge pull request #207 from ajanauskas/refactor/session_expire_method
...
Refactor session expire method
2013-09-13 06:16:23 -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
Andrius Janauskas
0150e9f2c3
Refactor session expire method
2013-09-13 16:04:12 +03: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
Matt Rogers
0e3000b2c5
Merge pull request #204 from mmozuras/refactor_to_use_format_any
...
Refactor to use format any
2013-09-13 05:17:08 -07:00
Mindaugas Mozūras
962b4fa5c9
Use respond_to { |format| format.any } to reduce duplication
2013-09-13 14:58:28 +03:00
Reinier Balt
4ca6114b76
weekly days were not getting through to the update of a recurring weekly todo
2013-09-05 20:18:14 +02:00
Reinier Balt
3ef55f3b17
Hopfully fix #1434 by updating selectors first. Same fix as #1431 but now for update
...
Conflicts:
app/controllers/recurring_todos_controller.rb
2013-09-05 20:13:28 +02:00
Reinier Balt
7e59b455f2
fix empty message in context view and handle removing last active todo from context correctly
2013-09-05 17:22:15 +02:00
Reinier Balt
0b38f3c43c
clean up a rec todos test
2013-09-05 17:14:01 +02: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
Reinier Balt
6e654c5d03
fix failing test
2013-09-05 10:53:16 +02:00
Reinier Balt
eb26e4e5a8
add favicon to public for clients that do not follow the url in the page headers but go
...
directly to /favicon.ico
2013-09-05 10:41:31 +02:00
Reinier Balt
d7076ca4f9
remove executable modes from these image files
2013-09-05 10:39:06 +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
e3ff831e98
Merge pull request #201 from doncruse/bug1442
...
Fixing bug #1442
2013-07-28 22:01:44 -07:00
Don Cruse
8ed20b35f2
Fixing bug #1442
...
This bug was caused when the chart encountered data outside of its
visible range (i.e., the upper bound of the array size). A test was
added that inserts some data from 2 years and 16 months in the past.
The test failed on the old version, throwing exactly the error in bug
report #1442 .
The fix is to check whether or not the value is within the array range
before sending the "+=" operator. With this change, the test passes.
2013-07-28 19:00:51 -05:00
Reinier Balt
58e0393efa
add json as dependency
2013-07-28 13:36:47 +02:00
Reinier Balt
8690dc1fcb
update gems
2013-07-28 13:34:48 +02:00
Reinier Balt
9fb8cb6881
Merge pull request #196 from mattdbridges/break-apart-login-action
...
Pull apart the LoginController#login action
2013-07-26 05:02:37 -07:00
Reinier Balt
4c4ce911fc
Merge pull request #199 from shaded2/csv_import
...
Csv import
2013-07-26 03:04:07 -07:00
Matt Rogers
e7c6142684
Update the version specifier for timecop
2013-07-24 12:35:11 -05:00
Matt Rogers
20f11ceac7
Merge pull request #200 from maddentim/fixes-general
...
Fix for #1440 Update db/schema with new syntax
2013-07-24 09:19:06 -07:00
Tim Madden
45a4210587
Update db/schema with new syntax
2013-07-24 10:14:46 -05:00
Darren Cato
3bf7888d5a
i18n changes
2013-07-23 13:21:56 -04:00
Matt Bridges
8ff75f9b7d
Pull apart the LoginController#login action
...
Begin pulling apart the different paths through the login action to
better understand how the action responds given different state.
2013-07-23 10:30:50 -05: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
feeaaf0c05
Merge pull request #198 from brogers/master
...
Move calendar test down to unit tests
2013-07-22 19:54:25 -07: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
Brett A. Rogers
f18f1c7345
Move calendar test down to unit tests
...
Remove tests that are specific to the calendar model from controller
test and move them to unit tests.
2013-07-19 17:27:38 -05:00
Brett A. Rogers
7a5374d567
Fix setup for calendar controller test
...
Ensure that the expected todos are actually due in the same month
2013-07-19 15:43:56 -05:00
Don Cruse
845ac14176
Moving label creation to helpers
2013-07-19 00:14:52 -05:00
Don Cruse
5b045d2c1a
Moving time labels to separate methods
2013-07-18 23:56:57 -05:00
Don Cruse
25bf820edc
Simplufying interpolation method
2013-07-18 23:48:33 -05:00
Don Cruse
3d2c048c44
Tweak to running averages
2013-07-18 23:43:44 -05:00
Don Cruse
ff54506e7f
Removing a single-line method
2013-07-18 23:37:34 -05:00
Don Cruse
5e6b82c3e5
Combining the running average methods
2013-07-18 23:22:44 -05:00
