Reinier Balt
b0b39433d5
Merge branch 'master' into new-gui
2013-09-05 12:24:47 +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
d7076ca4f9
remove executable modes from these image files
2013-09-05 10:39:06 +02:00
Reinier Balt
159acac9b6
add forms for new todo and multiple todos to modal
...
AJAX is not enabled yet
2013-08-26 12:08:33 +02:00
Reinier Balt
37f8acb214
fix count in navbar and fix tickler
2013-08-24 22:11:52 +02:00
Reinier Balt
031f9fe967
* Add details popover to action.
...
* Hide tags and overdue date on phones
* Depend on released twitter-bootstrap-rails instead of their master tree
2013-08-09 22:49:57 +02:00
Reinier Balt
f8d0ff31d4
re-enable dropdown
2013-08-08 19:03:43 +02:00
Reinier Balt
2fc3f65368
improve project show page and improve caching
2013-08-08 18:21:56 +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
31386db3df
Merge branch 'master' into new-gui
2013-08-05 16:04:40 +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
41ff0e20ae
Merge branch 'master' into new-gui
2013-07-29 12:37:20 +02:00
Reinier Balt
c63d1db6f2
improve collapsed view on small screen
2013-07-29 12:36:37 +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
d139693632
implement switching grouping
2013-07-29 12:23:52 +02: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
Darren Cato
c9c1569de0
i18n changes
2013-07-28 13:28:15 +02:00
Matt Bridges
84795cdead
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-28 13:28:15 +02:00
Darren Cato
eee9bd907c
made changes to MAX_DESCRIPTION_LENGTH everywhere
2013-07-28 13:28:15 +02:00
Darren Cato
bf99e8046a
typos and style tweaks
2013-07-28 13:28:15 +02:00
Darren Cato
7e076290b8
first pass at csv import functionality for tracks
2013-07-28 13:28:15 +02:00
Don Cruse
25f80bcf8b
Moving label creation to helpers
2013-07-28 13:27:28 +02:00
Don Cruse
3babc05a2d
Moving time labels to separate methods
2013-07-28 13:27:28 +02:00
Don Cruse
98a9acf741
Simplufying interpolation method
2013-07-28 13:27:28 +02:00
Don Cruse
1b7613f61b
Tweak to running averages
2013-07-28 13:27:27 +02:00
Don Cruse
180a6cddf9
Removing a single-line method
2013-07-28 13:27:27 +02:00
Don Cruse
b595bd23ab
Combining the running average methods
2013-07-28 13:27:27 +02:00
Don Cruse
bee43e21e9
Removing some more intermediate values
...
Also removing the python-esque combination methods to set multiple
disparate variables from a single method by refactoring that to a
simpler method.
Reducing the complexity of computing running averages.
Note: It is not clear to me why the actions_done_lastyears_data
action is entirely unscoped on date. That seems to be the expected
behavior, so I left it alone.
2013-07-28 13:27:27 +02:00
Don Cruse
d4bd8ed4db
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-28 13:27:27 +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
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
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
79fdd5d625
implement go to project with autocomplete
2013-07-20 23:21:24 +02:00
Reinier Balt
01005cc3d3
Merge branch 'master' into new-gui
2013-07-20 14:41:44 +02:00
Reinier Balt
28e3f377a8
fix failing validation on creating recurring todos
2013-07-20 14:40:50 +02:00
Reinier Balt
ff1fa62d4d
Merge branch 'master' into new-gui
2013-07-19 18:29:50 +02: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
