Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-01-06 17:28:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2949 commits 35 branches 36 tags 32 MiB
Commit graph

717 commits

Author SHA1 Message Date
Reinier Balt
eb1502d4e0 Merge branch 'master' into new-gui 
Conflicts:
	Gemfile.lock
 2014-01-07 21:01:55 +01:00
Reinier Balt
fa537fbeb0 Merge branch 'master' into new-gui 2013-10-02 10:26:32 +02:00
Reinier Balt
d35bc5ad62 Merge pull request #211 from GregSutcliffe/master 
Add integration docs for Mailgun
 2013-09-27 23:07:51 -07:00
Greg Sutcliffe
5e32d6da76 Add integration docs for Mailgun 2013-09-27 21:21:46 +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
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
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +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
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
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
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
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
Reinier Balt
c63d1db6f2 improve collapsed view on small screen 2013-07-29 12:36:37 +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
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
Reinier Balt
4c4ce911fc Merge pull request #199 from shaded2/csv_import 
Csv import
 2013-07-26 03:04:07 -07: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
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
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
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
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
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
a380799d74 remove old assets and archive layout files 2013-06-21 09:02:25 +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
4a485558e2 Merge branch 'master' into rails4 
Conflicts:
	Gemfile.lock
	config/routes.rb
 2013-06-17 09:25:02 +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
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
0e8552ac4e fix #1273. Used the wording suggested in this ticket. 2013-06-05 16:58:52 +02:00