Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-27 04:18:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2949 commits 32 branches 36 tags 32 MiB
Commit graph

1281 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
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
Greg Sutcliffe
8a2da01d51 Add Mailgun endpoint for receiving email tasks via Mailgun 2013-09-21 12:43:22 +01:00
Reinier Balt
871e18922b refactor the cli examples in /doc and fix a small bug in todos_controller 2013-09-18 17:45:22 +02:00
Reinier Balt
bbf6cdf702 fix failing cucumber scenario's and update gems 2013-09-18 10:38:20 +02:00
Reinier Balt
62bc47b26b fix regression in recurring todos 2013-09-17 15:40:20 +02:00
Reinier Balt
a31c0a7a5d fix import for csv 2013-09-16 11:37:16 +02:00
Reinier Balt
94114746e7 Merge pull request #209 from iangreenleaf/monthly_recurring_bug 
Fix endlessly repeating monthly recurring todos
 2013-09-15 00:48:40 -07:00
Ian Young
a6c32889ce Bug repeating monthly recurring todos 2013-09-14 18:12:56 -07:00
Ian Young
aff7069c0e Fix bug assigning value from every_x_day input 2013-09-13 23:15:11 -07: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
Reinier Balt
eaa66be698 fix deprecation warnings 2013-09-13 16:44:59 +02:00
Matt Rogers
b343d0a09e Merge pull request #207 from ajanauskas/refactor/session_expire_method 
Refactor session expire method
 2013-09-13 06:16:23 -07:00
Reinier Balt
e2eb31cfcc Merge pull request #206 from mmozuras/refactor_unless_blanks_into_presents 
Refactor unless blanks into presents
 2013-09-13 06:08:16 -07:00
Andrius Janauskas
0150e9f2c3 Refactor session expire method 2013-09-13 16:04:12 +03:00
Reinier Balt
35d0afdfdf Merge pull request #205 from mmozuras/refactor_negative_blanks_into_presents 
Refactor negative blanks into presents
 2013-09-13 05:56:03 -07:00
Mindaugas Mozūras
25e764b21a Refactor "unless blank?" into "if present?" 2013-09-13 15:40:09 +03:00
Mindaugas Mozūras
a97848f0ba Refactor negative blank? into present? 2013-09-13 15:19:25 +03:00
Mindaugas Mozūras
962b4fa5c9 Use respond_to { |format| format.any } to reduce duplication 2013-09-13 14:58:28 +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
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
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
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
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
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