Robert Waltemath 981944b869 Merge commit '1cdb9e8501' into rails3-multiple-recurring-tasks ... Conflicts: Gemfile db/schema.rb		2013-03-15 17:59:19 +01:00
..
_archive_tasks.html.haml	Fixed some bugs in tasks, apple feature:	2012-12-16 19:07:45 +01:00
_form.html.haml	Outlined new concept for multiple periodically recurring tasks (#3).	2012-11-28 10:13:54 +01:00
_list.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
_nav.haml	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
archive.haml	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
archive.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
edit.haml	Improved tasks.	2012-10-08 21:52:03 +02:00
index.haml	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
new.haml	Improved tasks.	2012-10-08 21:52:03 +02:00
show.haml	Show accept/reject button in task show view.	2012-12-22 14:29:59 +01:00
user.html.haml	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00
workgroup.haml	Introduced actionbar. Some fixes for balancing page.	2012-11-12 13:13:01 +01:00