Reinier Balt
3b673f0838
fix some failing cucumber tests
2014-01-09 11:18:33 +01:00
Reinier Balt
def136374c
fix regression. Still need to add test to controller tests
2014-01-09 08:05:14 +01:00
Reinier Balt
5dabde222e
dry previous commit even further
2014-01-07 20:49:37 +01:00
Reinier Balt
a23587370d
remove some duplication in todos_controller
2014-01-07 20:42:19 +01:00
Matt Rogers
16f721aefb
Remove an unneeded eval for an instance variable
2014-01-04 12:22:20 -06:00
Reinier Balt
9f55a45ec6
refactor search controller
2013-09-25 15:38:51 +02:00
Greg Sutcliffe
8a2da01d51
Add Mailgun endpoint for receiving email tasks via Mailgun
2013-09-21 12:43:22 +01:00
Reinier Balt
871e18922b
refactor the cli examples in /doc and fix a small bug in todos_controller
2013-09-18 17:45:22 +02:00
Reinier Balt
bbf6cdf702
fix failing cucumber scenario's and update gems
2013-09-18 10:38:20 +02:00
Reinier Balt
a31c0a7a5d
fix import for csv
2013-09-16 11:37:16 +02: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
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
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
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
2e13affdce
typos and style tweaks
2013-07-23 01:28:43 -04:00
Darren Cato
3450c22e97
first pass at csv import functionality for tracks
2013-07-21 13:37:35 -04: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
Don Cruse
70f633c150
Shifting more instance variables to the controller
...
Also removing some instance variables that were never invoked in the
views. This sets up a future refactoring of the method of comptuting
rolling averages, which differs between the two types of "last year"
views being refactored.
2013-07-18 21:01:39 -05:00
Don Cruse
1493304fc1
Refactor last year chart
...
Pulled some instance variable assignment into the controller.
Also extracted a method regarding interpolated values for the present
month.
2013-07-18 16:17:30 -05:00
Reinier Balt
d64f6e003e
Merge branch 'master' into rails4
...
Conflicts:
Gemfile.lock
2013-06-21 10:20:36 +02:00
Reinier Balt
64d3e802f2
fix #1406 . fix #1431 . set recurring_period first before setting other attributes
2013-06-19 16:42:35 +02:00
Reinier Balt
2daffef683
fix failing tests
2013-06-17 10:06:38 +02: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
0a57a68a87
Project and context view can now be grouped by context and project (using view menu)
2013-06-11 11:12:21 +02:00
Reinier Balt
9c56416dcb
Merge pull request #184 from mattr-/cucumber-login-backdoor
...
Move the expire_session route
2013-06-10 21:52:25 -07:00
Matt Rogers
931791edfd
Move the expire_session route
...
It's now in the cucumber login helper.
2013-06-10 14:30:12 -05:00
Reinier Balt
02d4afb724
fix #1429 by correctly handling tags with dots
...
This was a very old regression. This used to work before the rails 3.2 upgrade... Added tests
to prevent future unnoticed breakage
2013-06-03 15:20:13 +02:00
Reinier Balt
671f64b419
move to strong_parameters of rails4.
2013-05-27 12:44:31 +02:00
Reinier Balt
8ffacca393
fix cucumber scenario's.
...
One still fails on Cookie overflow, but works testing by hand...
2013-05-13 17:13:26 +02:00
Reinier Balt
08498fee4f
fix failing tests
...
Includes a monkey patch for Arel that may need to be removed when 4.0.0 final ships
2013-05-13 15:35:21 +02:00
Reinier Balt
80974fb0d5
empty non-saved project caused rss builder to fail
2013-05-13 12:50:10 +02:00
Reinier Balt
ebff4cfc0c
start fixing deprecation warnings
2013-05-11 23:13:32 +02:00
