wvengen 94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup ... Conflicts: app/views/deliveries/_stock_article_form.html.haml config/locales/de.yml config/locales/en.yml		2013-12-17 15:58:47 +01:00
..
_form.html.haml	Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup	2013-12-17 15:58:47 +01:00
_stock_article_for_adding.html.haml	Slightly cleanup delivery form	2013-12-07 16:57:53 +01:00
_stock_change.html.haml	Linearize and clean up delivery form	2013-06-26 15:16:52 +02:00
_stock_change_fields.html.haml	Replace 'own' js table sorting by stupidtable plugin	2013-07-16 22:01:56 +02:00
add_stock_change.js.erb	clean up price tooltips javascript	2013-10-09 10:43:41 +02:00
edit.html.haml	finish deliveries i18n	2013-04-10 17:02:16 +02:00
form_on_stock_article_create.js.erb	Improve usability of supplier selection for stock_articles in delivery form	2013-12-09 00:03:07 +01:00
form_on_stock_article_update.js.erb	Improve usability of supplier selection for stock_articles in delivery form	2013-12-09 00:03:07 +01:00
index.html.haml	i18n simple_form move of deliveries	2013-10-09 23:19:40 +02:00
new.html.haml	finish deliveries i18n	2013-04-10 17:02:16 +02:00
show.html.haml	i18n fix (thanks @JuliusR)	2013-12-14 23:52:59 +01:00