Reinier Balt 899df1ef8f Merge branch 'master' into new-gui ... Conflicts: Gemfile.lock app/assets/stylesheets/tracks.css.scss app/controllers/todos_controller.rb app/services/rich_message_extractor.rb app/services/todo_from_rich_message.rb app/views/todos/all_done.html.erb config/initializers/rack-mini-profiler.rb test/models/rich_message_extractor_test.rb test/models/todo_from_rich_message_test.rb		2014-03-06 10:31:39 +01:00
..
todos	Merge pull request #206 from mmozuras/refactor_unless_blanks_into_presents	2013-09-13 06:08:16 -07:00
application_controller.rb	fix some failing cucumber tests	2014-01-09 11:18:33 +01:00
calendar_controller.rb	Rename to_xml_params to todo_xml_params	2013-04-30 22:52:22 -05:00
contexts_controller.rb	Merge branch 'master' into new-gui	2013-09-13 16:52:06 +02:00
data_controller.rb	fix import for csv	2013-09-16 11:37:16 +02:00
feedlist_controller.rb	remove duplication in feedlist controller	2013-05-11 10:49:38 +02:00
integrations_controller.rb	small refactorings	2013-05-05 20:32:32 +02:00
login_controller.rb	Pull apart the LoginController#login action	2013-07-28 13:28:15 +02:00
mailgun_controller.rb	Add Mailgun endpoint for receiving email tasks via Mailgun	2013-09-21 12:43:22 +01:00
notes_controller.rb	move to strong_parameters of rails4.	2013-05-27 12:44:31 +02:00
preferences_controller.rb	Refactor negative blank? into present?	2013-09-13 15:19:25 +03:00
projects_controller.rb	Merge branch 'master' into new-gui	2013-09-22 10:30:24 +02:00
recurring_todos_controller.rb	Merge pull request #206 from mmozuras/refactor_unless_blanks_into_presents	2013-09-13 06:08:16 -07:00
search_controller.rb	refactor search controller	2013-09-25 15:38:51 +02:00
stats_controller.rb	Fixing bug #1442	2013-07-28 19:00:51 -05:00
todos_controller.rb	Merge branch 'master' into new-gui	2014-03-06 10:31:39 +01:00
users_controller.rb	move to strong_parameters of rails4.	2013-05-27 12:44:31 +02:00