wvengen 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 ... Conflicts: app/controllers/admin/ordergroups_controller.rb app/controllers/finance/balancing_controller.rb app/controllers/suppliers_controller.rb app/views/articles/_article.html.haml app/views/finance/balancing/_summary.haml app/views/finance/balancing/new.html.haml app/views/group_orders/_form.html.haml app/views/home/_apple_bar.html.haml app/views/suppliers/index.haml		2013-03-21 22:08:09 +01:00
..
_article.html.haml	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
_articles.html.haml	start articles i18n	2013-03-09 00:40:07 +01:00
_destroy_active_article.haml	start articles i18n	2013-03-09 00:40:07 +01:00
_edit_all_table.html.haml	Fixed articles module.	2012-10-28 18:03:50 +01:00
_form.html.haml	start articles i18n	2013-03-09 00:40:07 +01:00
_import_search_results.haml	Allow importing articles again, when article was deleted before.	2013-03-17 20:02:14 +01:00
create.js.haml	Fixed articles views.	2012-10-19 01:12:47 +02:00
destroy.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
edit_all.html.haml	start articles i18n	2013-03-09 00:40:07 +01:00
index.haml	Removed acts_as_paranoid. Implemented own version.	2013-03-16 17:57:38 +01:00
index.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
new.js.haml	Fixed finance module to work with bootstrap design.	2012-11-10 16:44:05 +01:00
parse_upload.html.haml	Fixed articles module.	2012-10-28 18:03:50 +01:00
shared.js.haml	Fixed admin, orders, wiki views. Converted all erb to haml.	2012-10-15 21:19:17 +02:00
sync.html.haml	Fixed articles sync view.	2013-03-17 17:47:37 +01:00
update.js.haml	Removed fancybox. Fixed profile, my ordergroup and tasks.	2012-11-12 09:18:44 +01:00
upload.html.haml	Fixed articles module.	2012-10-28 18:03:50 +01:00