Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
foodsoft/app/views
History
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
..
admin fallback for when nick is nil 2013-10-29 19:05:24 +01:00
article_categories small i18n bug 2013-10-22 00:09:11 +02:00
articles fix and cleanup routing (closes foodcoops#190) 2013-10-30 02:27:04 +01:00
deliveries Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
feedback i18n feedback + controller 2013-02-09 13:01:44 +07:00
finance Merge branch 'master' into allow-no-nickname 2013-10-29 19:15:52 +01:00
foodcoop Merge branch 'master' into allow-no-nickname 2013-10-29 19:15:52 +01:00
group_orders Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
home Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
invites small i18n update 2013-10-02 17:08:24 +02:00
kaminari Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
layouts Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
login Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
mailer start of making nickname optional 2013-09-20 22:40:13 +02:00
messages beautify map invocations of users 2013-10-29 18:46:55 +01: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 Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
sessions clearer login field name 2013-10-30 21:28:35 +01:00
shared Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
stock_takings Merge branch 'master' into allow-no-nickname 2013-10-29 19:15:52 +01:00
stockit fix stockit i18n reference 2013-10-10 19:23:37 +02:00
suppliers Merge branch 'master' into i18n 2013-10-18 12:30:34 +02:00
tasks Merge branch 'master' into allow-no-nickname 2013-11-18 11:42:49 +01:00
workgroups Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00