Reinier Balt 59291f305f Merge branch 'master' into new-gui ... Conflicts: Gemfile.lock app/assets/javascripts/application.js app/helpers/todos_helper.rb app/views/shared/_footer.html.erb		2014-06-26 10:46:20 +02:00
..
recurring_todos	dry form_helper using meta programming.	2014-03-31 09:43:39 +02: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	Add mobile calendar view	2014-04-21 12:55:13 -04: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	remove Digest deprecation warning	2014-05-16 14:33:18 +02: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	Return a valid RecurringTodo after creation error	2014-06-19 01:17:15 -04:00
search_controller.rb	refactor search controller	2013-09-25 15:38:51 +02:00
stats_controller.rb	fix failing tests	2014-05-16 14:33:18 +02:00
todos_controller.rb	Merge branch 'master' into new-gui	2014-06-26 10:46:20 +02:00
users_controller.rb	move to strong_parameters of rails4.	2013-05-27 12:44:31 +02:00