Reinier Balt
f32547136b
Merge branch 'master' into new-gui
...
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
2013-07-28 13:35:34 +02:00
Reinier Balt
8690dc1fcb
update gems
2013-07-28 13:34:48 +02:00
Reinier Balt
92eb88a68d
update gems
2013-07-28 13:29:22 +02:00
Matt Rogers
a89e26bc97
Update the version specifier for timecop
2013-07-28 13:28:42 +02:00
Tim Madden
9d51c01b21
Update db/schema with new syntax
2013-07-28 13:28:16 +02: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
Brett A. Rogers
9820143dee
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-28 13:27:28 +02:00
Brett A. Rogers
d541fc24d7
Fix setup for calendar controller test
...
Ensure that the expected todos are actually due in the same month
2013-07-28 13:27:28 +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
Darren Cato
9de6d85342
modified gitignore
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
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
c9d7fd1124
Use the proper version of timecop
2013-07-22 22:27:04 -05: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
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
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
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
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
Don Cruse
91e4717168
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-18 23:05:38 -05: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 Rogers
bc61f15c6c
Merge pull request #194 from stacyvlasits/master
...
fixed next month label for calendar view
2013-07-18 20:09:18 -07:00
