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
7e59b455f2
fix empty message in context view and handle removing last active todo from context correctly
2013-09-05 17:22:15 +02:00
Reinier Balt
0b38f3c43c
clean up a rec todos test
2013-09-05 17:14:01 +02:00
Reinier Balt
b0b39433d5
Merge branch 'master' into new-gui
2013-09-05 12:24:47 +02:00
Reinier Balt
fee1e3b504
fix failing test on timezones and remove debug message
2013-09-05 12:23:26 +02:00
Reinier Balt
cb46a8461e
fix show_from not being clear when a todo comes from tickler
2013-09-05 12:21:43 +02:00
Reinier Balt
6e654c5d03
fix failing test
2013-09-05 10:53:16 +02:00
Reinier Balt
eb26e4e5a8
add favicon to public for clients that do not follow the url in the page headers but go
...
directly to /favicon.ico
2013-09-05 10:41:31 +02:00
Reinier Balt
d7076ca4f9
remove executable modes from these image files
2013-09-05 10:39:06 +02:00
Reinier Balt
159acac9b6
add forms for new todo and multiple todos to modal
...
AJAX is not enabled yet
2013-08-26 12:08:33 +02:00
Reinier Balt
37f8acb214
fix count in navbar and fix tickler
2013-08-24 22:11:52 +02:00
Reinier Balt
031f9fe967
* Add details popover to action.
...
* Hide tags and overdue date on phones
* Depend on released twitter-bootstrap-rails instead of their master tree
2013-08-09 22:49:57 +02:00
Reinier Balt
f8d0ff31d4
re-enable dropdown
2013-08-08 19:03:43 +02:00
Reinier Balt
2fc3f65368
improve project show page and improve caching
2013-08-08 18:21:56 +02:00
Reinier Balt
8151cd9473
forgot to commit routing changes
2013-08-08 09:32:38 +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
31386db3df
Merge branch 'master' into new-gui
2013-08-05 16:04:40 +02:00
Matt Rogers
6681df9530
Merge pull request #202 from TracksApp/extract-extras-from-user
...
Extract time and date concerns from User
2013-08-01 14:59:17 -07:00
Matt Rogers
96777c2e3a
Replace User#time with UserTime#time
2013-07-30 16:21:04 -05:00
Matt Rogers
8512e8db3b
rename DateUtils to UserTime
2013-07-29 21:51:15 -05:00
Matt Rogers
6c695aa61a
Fix a date-based issue in the project tests
...
Due to time zone issues, this test was failing for me because it was
attempting to compare a date in my local time zone with a UTC date.
2013-07-29 21:43:05 -05:00
Matt Rogers
07a983ca1c
clean up whitespace
2013-07-29 16:36:52 -05:00
Matt Rogers
a1aaa283f1
Remove User#at_midnight
...
Replace it with a class called DateUtils with a method called
`#midnight_for` that takes a preference instance and date to convert to
midnight.
2013-07-29 16:34:23 -05:00
Reinier Balt
41ff0e20ae
Merge branch 'master' into new-gui
2013-07-29 12:37:20 +02:00
Reinier Balt
c63d1db6f2
improve collapsed view on small screen
2013-07-29 12:36:37 +02:00
Reinier Balt
75ab8364a2
change version to 3.0devel
2013-07-29 12:25:33 +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
Reinier Balt
d139693632
implement switching grouping
2013-07-29 12:23:52 +02:00
Reinier Balt
e3ff831e98
Merge pull request #201 from doncruse/bug1442
...
Fixing bug #1442
2013-07-28 22:01:44 -07: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
dbe8060bec
Merge branch 'master' into new-gui
...
Conflicts:
Gemfile.lock
2013-07-28 13:37:45 +02:00
Reinier Balt
58e0393efa
add json as dependency
2013-07-28 13:36:47 +02:00
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
