Commit graph

259 commits

Author SHA1 Message Date
Reinier Balt
d44538f604 Merge branch 'master' into new-gui 2013-09-25 16:22:47 +02:00
Reinier Balt
067db90d58 various small refactorings 2013-09-22 17:34:58 +02:00
Reinier Balt
463f5e922d Merge branch 'master' into new-gui
Conflicts:
	Gemfile.lock
2013-09-22 10:30:24 +02:00
Reinier Balt
bbf6cdf702 fix failing cucumber scenario's and update gems 2013-09-18 10:38:20 +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
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03: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
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
31386db3df Merge branch 'master' into new-gui 2013-08-05 16:04:40 +02:00
Matt Rogers
96777c2e3a Replace User#time with UserTime#time 2013-07-30 16:21:04 -05: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
25f80bcf8b Moving label creation to helpers 2013-07-28 13:27:28 +02:00
Matt Rogers
bcbfe42899 Merge pull request #195 from doncruse/master
Removing some intermediate values and shifting HTML formatting to a helper
2013-07-22 19:44:18 -07:00
Reinier Balt
ff1fa62d4d Merge branch 'master' into new-gui 2013-07-19 18:29:50 +02:00
Don Cruse
845ac14176 Moving label creation to helpers 2013-07-19 00:14:52 -05:00
Stacy Vlasits
9896705bf2 fixed next month label for calendar view 2013-07-18 16:43:05 -05:00
Reinier Balt
c7aa8ca597 add submenu to todos 2013-07-06 13:20:58 +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
972210326a change look of todo 2013-06-27 22:47:11 +02:00
Reinier Balt
ab0006dc34 initial port of context-show view 2013-06-22 16:04:17 +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
7084c11263 fix failing tests 2013-06-11 15:36:27 +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
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
Reinier Balt
7efb155928 fix regression 2013-05-05 20:54:12 +02:00
Reinier Balt
ccdaae038b small refactorings 2013-05-05 20:32:32 +02:00
Reinier Balt
5cfa115cdc small refactorings
fix passing params in use of _collection
2013-05-03 21:54:03 +02:00
Reinier Balt
0607096e7c add cucumber tests for tickler with group by project 2013-04-24 23:30:58 +02:00
Reinier Balt
9172d5e001 fix failing scenario 2013-04-17 23:26:46 +02:00
Reinier Balt
8641ecfc4e add some project grouping scenarios to edit_a_todo and fix failures
also refactor step definitions
2013-04-17 22:11:24 +02:00
Reinier Balt
5f8f2eefa9 fix failing calendar scenarios 2013-04-16 10:20:44 +02:00
Reinier Balt
9c0445fcb7 make adding of todos from sidebar work in context and project grouping 2013-04-11 10:53:35 +02:00
Dan Rice
e6dceb5058 Fix contexts not being viewable if collapsed
Contexts collapsed on the homepage were also being collapsed on the
context detail page, but without the option to expand them.
This change stops collapsing them on the detail page regardless of the
setting on the homepage.
2013-03-20 18:56:40 +02:00
Reinier Balt
85fc82d494 refactor done todos view and tests 2013-03-18 12:36:40 +01:00
Reinier Balt
0a9755c8a3 get all scenario's running again, first pass. 2013-03-18 12:36:40 +01:00
Reinier Balt
ede898120c remove option to show empty containers and start fixing failing cucumber scenarios 2013-03-18 12:36:40 +01:00
Reinier Balt
22b371ef8c do a big refactor of rendering collections of todos for home page, tag page, project page, context page 2013-03-18 12:36:40 +01:00
Reinier Balt
f22dfc1f9b initial changes to add an option to select either context or project as grouping of todos on home or tag page
* new menu item in view menu
* js to toggle view
* store setting in cookie to keep de choice of view persistent
* refactor index and tag page of todos to look more alike
* refactor context and project partials to look more alike
2013-03-18 12:32:28 +01:00
Dan Rice
d0a12a7010 Merge pull request #173 from zoombody/remove_formatize
Render notes using RedCloth without formatize
2013-03-13 08:58:48 -07:00
Dan Rice
dc311221f1 Render notes using RedCloth without formatize
Removes the outdated bluecloth dependency
2013-03-13 17:03:58 +02:00
Matt Rogers
63fc460c00 Refactor the empty message criteria into its own method.
Removes plenty of duplication in the code
2013-03-12 14:21:12 -05:00
Matt Rogers
d699359648 Move the view logic back into the helper
Staleness#days_stale only gives us the number of days that a Todo has
been stale. Add the logic for choosing the CSS class to use back to the
view helper.
2013-03-10 22:18:59 -05:00
Matt Rogers
8dfbac0fe8 Use the newly extracted method object for getting todo staleness 2013-03-09 22:38:38 -06:00
Katrina Owen
3f496db4b4 Split up the font size calculation
The font size is a view concern, but the relative size belongs in the
model layer.
2013-03-02 07:14:52 -05:00
Katrina Owen
0b733b6183 Override #to_s on Tag for simplified joining 2013-02-19 08:47:47 -07:00
Katrina Owen
95a4ed6e4a Add Tag#label method 2013-02-18 15:12:53 -07:00
Reinier Balt
5454ba385f fix styling of error messages 2012-12-16 15:20:43 +01:00
tim madden
f7f8b79f5b Eliminating unneeded blank space character from show_date_tag
The space character causes the 'Show in x period' background color to
run into the todo description.

Closes #1368
2012-11-30 16:08:25 -06:00