Commit graph

2825 commits

Author SHA1 Message Date
Reinier Balt
ff1fa62d4d Merge branch 'master' into new-gui 2013-07-19 18:29:50 +02: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
Matt Rogers
efc09f9d3e Merge pull request #192 from crymer11/master
use a null object like a boss
2013-07-18 19:54:06 -07:00
Matt Rogers
08d872e3c1 Merge pull request #191 from doncruse/master
Refactor last year chart
2013-07-18 19:52:12 -07: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
Matt Bridges
ecdade33c3 Pull out RichMessageExtractor
No need to have it embedded
  when it should be unit tested!
2013-07-18 18:34:09 -05:00
Stacy Vlasits
9896705bf2 fixed next month label for calendar view 2013-07-18 16:43:05 -05:00
Matt Bridges
519e3df4d4 TodoFromRichMessage is really a service object 2013-07-18 16:41:28 -05:00
Colin Rymer
0a5936fecf use a null object like a boss 2013-07-18 16:37:34 -05:00
Matt Bridges
c2111b2f8e Extract behavior from Todo.from_rich_message
`Todo.from_rich_message` was partially tested from the MessageGateway,
but it is mostly untested and does not belong in Todo due to it's unique
nature. Extract it entirely from `Todo` into it's own dedicated object
for unit testing.
2013-07-18 16:35:51 -05:00
Matt Rogers
6d963f81c0 Merge pull request #190 from crymer11/master
remove `return`s and clean up some conditionals
2013-07-18 14:21:34 -07: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
Colin Rymer
55e2f5b6a1 remove returns and clean up some conditionals 2013-07-18 16:03:18 -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
d670839460 Merge branch 'master' into new-gui 2013-07-13 23:19:42 +02: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
c7aa8ca597 add submenu to todos 2013-07-06 13:20:58 +02:00
Reinier Balt
c5884a3f3c Merge branch 'master' into new-gui 2013-07-05 17:03:36 +02: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
db29b84f69 add keyboard shortcuts and make todos selectable useing j and k 2013-07-01 15:56:54 +02:00
Reinier Balt
b725b7b137 clean up menu bar 2013-06-28 09:46:21 +02:00
Reinier Balt
8e0013d0df add shortcuts, help dialog and start on add-action dialog 2013-06-27 22:47:34 +02:00
Reinier Balt
972210326a change look of todo 2013-06-27 22:47:11 +02:00
Reinier Balt
b79efb3f31 Merge branch 'master' into new-gui 2013-06-25 16:51:05 +02:00
Reinier Balt
e03514886c update gemfile for rails4 final release 2013-06-25 16:50:07 +02:00
Reinier Balt
ab0006dc34 initial port of context-show view 2013-06-22 16:04:17 +02:00
Reinier Balt
7da6c6cad4 add navigation to application layout 2013-06-22 13:48:06 +02:00
Reinier Balt
4770857d76 Merge branch 'rails4' into new-gui 2013-06-21 10:20:49 +02:00
Reinier Balt
d64f6e003e Merge branch 'master' into rails4
Conflicts:
	Gemfile.lock
2013-06-21 10:20:36 +02:00
Reinier Balt
b6dc330ab0 migrate login page 2013-06-21 10:18:02 +02:00
Reinier Balt
40eb14fc1a remove niftycorners and superfish 2013-06-21 09:23:39 +02:00
Reinier Balt
a380799d74 remove old assets and archive layout files 2013-06-21 09:02:25 +02:00
Reinier Balt
680872aafc install bootstrap 2013-06-21 08:53:35 +02:00
Reinier Balt
9bb3702d78 install mousetrap 2013-06-21 08:52:19 +02:00
Reinier Balt
40704b3e98 add bootstrap and mousetrap 2013-06-21 08:52:06 +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