wvengen f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 ... Conflicts: app/controllers/articles_controller.rb app/views/articles/_form.html.haml app/views/articles/sync.html.haml app/views/finance/balancing/_edit_note.html.haml app/views/finance/group_order_articles/_form.html.haml app/views/finance/order_articles/_edit.html.haml app/views/finance/order_articles/_new.html.haml app/views/group_orders/show.html.haml app/views/invites/_modal_form.html.haml		2013-04-12 15:45:24 +02:00
..
_article.html.haml	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-03-21 22:08:09 +01:00
_articles.html.haml	use short form plus title for unit quantity	2013-04-04 00:24:14 +02:00
_destroy_active_article.haml	start articles i18n	2013-03-09 00:40:07 +01:00
_edit_all_table.html.haml	finish articles i18n	2013-03-22 00:20:37 +01:00
_form.html.haml	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-04-12 15:45:24 +02:00
_import_search_results.haml	finish articles i18n	2013-03-22 00:20:37 +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	move commonly used verbs to common i18n identifier	2013-04-04 02:49:52 +02:00
index.haml	finish articles i18n	2013-03-22 00:20:37 +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	move commonly used verbs to common i18n identifier	2013-04-04 02:49:52 +02: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	Merge remote-tracking branch 'bennibu/rails3' into rails3	2013-04-12 15:45:24 +02:00
update.js.haml	Removed fancybox. Fixed profile, my ordergroup and tasks.	2012-11-12 09:18:44 +01:00
upload.html.haml	finish articles i18n	2013-03-22 00:20:37 +01:00