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
Matt Rogers
0877bf9ab8
Merge pull request #189 from crymer11/master
...
Stylistic changes and metaprogramming refactoring
2013-07-18 13:29:06 -07:00
Matt Rogers
a27f4f1dd4
Merge pull request #188 from maddentim/fixes-mobile
...
Fix #1438 by adding mobile stylesheets to asset pipeline
2013-07-18 13:27:38 -07:00
Colin Rymer
c71dc9afc9
remove boolean returning ternary expression
2013-07-18 15:22:46 -05:00
Colin Rymer
c5968b798c
better leverage Hash#each for metaprogramming
2013-07-18 15:13:30 -05:00
Colin Rymer
332589163c
metaprogramming and stylistic changes
...
- Use `define_method` to clean up definition of methods that only
vary by the name of the day they reference and the corresponding
numerical value.
- Remove calls to self, explicit return statements, etc.
2013-07-18 15:01:02 -05:00
Colin Rymer
45df84b739
consolidate validates_presence_of validations
2013-07-18 14:10:14 -05:00
Tim Madden
3a290c0f6e
Fix #1438 by adding mobile stylesheets to asset pipeline
2013-07-18 11:11:16 -05:00
Reinier Balt
a201ecf737
Merge pull request #187 from TracksApp/https-gemfile
...
Use HTTPS URIs for git repos
2013-07-09 08:07:53 -07:00
Matt Rogers
8e4154e24a
Use HTTPS URIs for git repos
2013-07-09 09:56:52 -05:00
Reinier Balt
9f4cec3117
Fix #1433 by adding login and print stylesheets to asset pipeline
2013-07-05 17:03:01 +02:00
Reinier Balt
9522a611cd
Merge pull request #186 from rnck/mylocalisation
...
updated german locale de.yml
2013-07-03 06:52:05 -07:00
Heiko Reincke
3ccefa4e06
updated german locale de.yml
2013-07-03 08:45:27 +02:00
Reinier Balt
e03514886c
update gemfile for rails4 final release
2013-06-25 16:50:07 +02:00
Reinier Balt
d64f6e003e
Merge branch 'master' into rails4
...
Conflicts:
Gemfile.lock
2013-06-21 10:20:36 +02:00
Reinier Balt
f4908f2b7b
fix cache invariant for grouped todos in context and project view
2013-06-19 17:47:51 +02:00
Reinier Balt
1ae6e13f1d
update gems
2013-06-19 16:50:02 +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
20b4b626fe
update for rails4rc2
2013-06-17 09:32:46 +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
56b884055f
fix #1270 . if start-from fits the recurrence pattern, the first todo should use the start-from date
...
this is use-case 2 mentioned in the ticket.
2013-06-11 23:38:30 +02:00
Reinier Balt
3a2af7caf2
update CHANGELOG [ci skip]
2013-06-11 16:30:32 +02:00
Reinier Balt
be1a9528d5
move the two toggle links in top-right to view menu
2013-06-11 16:13:46 +02:00
Reinier Balt
7084c11263
fix failing tests
2013-06-11 15:36:27 +02:00
Reinier Balt
07de6a8358
fix expiration test. it was missing a rendering
2013-06-11 15:24:20 +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
591e20c9f1
update gems
2013-06-11 11:11:40 +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
0a10a2050b
Merge pull request #183 from mattr-/cucumber-login-backdoor
...
Add login backdoor to speed up the cucumber test suite
2013-06-09 21:49:00 -07:00
Reinier Balt
0e8552ac4e
fix #1273 . Used the wording suggested in this ticket.
2013-06-05 16:58:52 +02:00
Reinier Balt
b6bf21987d
add new rvm dotfiles to gitignore
2013-06-05 16:30:03 +02:00
Matt Rogers & Katrina Owen
2c5aff3b36
Add login backdoor to speed up the cucumber test suite
2013-06-04 19:39:06 -05:00
Reinier Balt
651e45d389
merge i18n keys to better support fr locale and update en, fr and nl locale for the change
...
es was updated by tolk, but no changes in content
2013-06-04 11:47:47 +02:00
Reinier Balt
b6e110c917
fix #1422 . Changing default tags of a project is now remembered
...
when not updating the whole page
2013-06-04 10:50:42 +02:00
Reinier Balt
ee9951403e
fix #1419 for master too: do not show new todo that was added with show_from set
2013-06-04 10:31:29 +02:00
Heraldo Esquiche
f8300de7df
Update es.yml
...
manually merged with 2.3devel
2013-06-04 10:19:36 +02:00
Reinier Balt
a8af880647
fix #1417 . We now handle unblocking a todo that is part of a hidden project or context
2013-06-04 10:07:02 +02:00
Reinier Balt
2921746409
fix manual merge error
2013-06-03 15:21:19 +02: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
b87326acd7
update cs and he locales too
...
tolk:import did not work correctly because my tolk tables in mysql were in latin1, not in utf-8
after changing my tables and columns to utf-8 I was able to import he and cs locale correctly
and regenerate
2013-05-27 15:47:08 +02:00
Reinier Balt
301af365a3
update nl locale and regenerate locales for de, es and fr
...
cs and he cannot be regenerated because some or all characters are not imported by Tolk
2013-05-27 14:36:50 +02:00
Reinier Balt
cb4c627153
Merge branch 'master' into rails4
2013-05-27 12:46:13 +02:00
Reinier Balt
671f64b419
move to strong_parameters of rails4.
2013-05-27 12:44:31 +02:00
Reinier Balt
08282bf990
Merge pull request #180 from Lem/master
...
Date format fix in german locales
2013-05-25 14:18:55 -07:00
Reinier Balt
049296fd33
update bundle and remove unneeded gem
2013-05-25 23:17:39 +02:00
Thorben Went
f2e08ab65c
Fix date format in german locales. Bug will result in defect datepicker.
...
See ticket #1427 on assembla
2013-05-18 10:52:51 +02:00
