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
..
calendar	Move the calendar to its own controller	2013-04-30 20:09:46 -05:00
contexts	Merge branch 'master' into new-gui	2013-09-05 20:19:48 +02:00
data	fix import for csv	2013-09-16 11:37:16 +02:00
feedlist	get login, mobile and notes features passing	2012-05-12 13:37:36 +02:00
integrations	Merge branch 'master' into new-gui	2014-01-07 21:01:55 +01:00
layouts	Merge branch 'master' into new-gui	2014-03-06 10:31:39 +01:00
login	add navigation to application layout	2013-06-22 13:48:06 +02:00
notes	Render notes using RedCloth without formatize	2013-03-13 17:03:58 +02:00
preferences	fix #1350 by removing admin_email from preferences model and add it as a site option in	2012-12-23 21:03:37 +01:00
projects	Merge branch 'master' into new-gui	2014-01-07 21:01:55 +01:00
recurring_todos	Replace User#time with UserTime#time	2013-07-30 16:21:04 -05:00
search	refactor search controller	2013-09-25 15:38:51 +02:00
shared	add forms for new todo and multiple todos to modal	2013-08-26 12:08:33 +02:00
stats	Moving label creation to helpers	2013-07-28 13:27:28 +02:00
todos	Merge branch 'master' into new-gui	2014-03-06 10:31:39 +01:00
users	Replace stray error_messages_for uses with working get_list_of_error_messages_for calls	2012-09-03 20:00:13 +02:00