foodsoft/app/views
wvengen b9599ce455 Merge branch 'master' into updated-gems
Conflicts:
	Gemfile.lock
2013-07-18 20:28:56 +02:00
..
admin Merge remote-tracking branch 'fsmanuel/master' into master. 2013-07-18 18:48:49 +02:00
article_categories move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
articles import manufacturer and origin too (closes #140) 2013-07-06 17:48:40 +02:00
deliveries fix tooltip after bootstrap update 2013-07-17 11:31:27 +02:00
feedback i18n feedback + controller 2013-02-09 13:01:44 +07:00
finance proper usage of jQuery.on(), and update javascript in views as well 2013-07-08 22:41:06 +02:00
foodcoop removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
group_orders merge branch minimum_balance into master (closes #133) 2013-07-10 22:03:57 +02:00
home move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
invites Merge remote-tracking branch 'bennibu/rails3' into rails3 2013-04-12 15:45:24 +02:00
kaminari Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
layouts be safe even with locale string 2013-07-07 02:31:42 +02:00
login move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
mailer beautify order mail 2013-06-29 02:54:00 +02:00
messages move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
order_comments Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
ordergroups Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
orders show quantity/tolerance in order screen when unit_quantity=1 2013-07-11 23:20:37 +02:00
pages add deliveries, pages, tasks translation in English 2013-05-06 12:43:57 +02:00
sessions do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone 2013-06-26 00:42:09 +02:00
shared Merge remote-tracking branch 'fsmanuel/master' into master. 2013-07-18 18:48:49 +02:00
stock_takings Resolve merge conflicts with i18n 2013-06-10 20:05:47 +02:00
stockit Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
suppliers move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
tasks Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
workgroups Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00