Reinier Balt
eb1502d4e0
Merge branch 'master' into new-gui
...
Conflicts:
Gemfile.lock
2014-01-07 21:01:55 +01:00
Reinier Balt
d44538f604
Merge branch 'master' into new-gui
2013-09-25 16:22:47 +02:00
Reinier Balt
9f55a45ec6
refactor search controller
2013-09-25 15:38:51 +02:00
Reinier Balt
463f5e922d
Merge branch 'master' into new-gui
...
Conflicts:
Gemfile.lock
2013-09-22 10:30:24 +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
9c86396ef0
Merge branch 'master' into new-gui
...
Conflicts:
app/views/projects/_project_settings.html.erb
app/views/todos/_todo.html.erb
2013-09-13 16:52:06 +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
d3f46c59eb
Merge branch 'master' into new-gui
...
Conflicts:
app/views/contexts/show.html.erb
2013-09-05 20:19:48 +02: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
37f8acb214
fix count in navbar and fix tickler
2013-08-24 22:11:52 +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
41ff0e20ae
Merge branch 'master' into new-gui
2013-07-29 12:37:20 +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
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
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
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
Reinier Balt
79fdd5d625
implement go to project with autocomplete
2013-07-20 23:21:24 +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
